From 7b0e9ec7ecb10583e94e764b240c23f4adf158a7 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Tue, 7 May 2024 17:42:59 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 1 + .../binary/generated/fancy_content.ini | 1 + .../console/binary/generated/live_data_ids.h | 20 +- .../binary/generated/output_channels.ini | 321 ++++++++--------- .../console/binary/generated/sensors.java | 265 +++++++------- .../generated/total_live_data_generated.h | 2 +- .../console/binary_log/log_fields_generated.h | 3 + .../generated/rusefi_generated_alphax-2chan.h | 6 +- .../generated/rusefi_generated_alphax-4chan.h | 6 +- .../rusefi_generated_alphax-4chan_f7.h | 6 +- .../rusefi_generated_alphax-8chan-revA.h | 6 +- .../generated/rusefi_generated_alphax-8chan.h | 6 +- .../rusefi_generated_alphax-8chan_f7.h | 6 +- .../rusefi_generated_at_start_f435.h | 6 +- .../generated/rusefi_generated_atlas.h | 6 +- .../rusefi_generated_f407-discovery.h | 6 +- .../rusefi_generated_f429-discovery.h | 6 +- .../rusefi_generated_f469-discovery.h | 6 +- .../rusefi_generated_frankenso_na6.h | 6 +- .../generated/rusefi_generated_haba208.h | 6 +- .../rusefi_generated_hellen-112-17.h | 6 +- .../rusefi_generated_hellen-gm-e67.h | 6 +- .../rusefi_generated_hellen-honda-k.h | 6 +- .../generated/rusefi_generated_hellen-nb1.h | 6 +- .../rusefi_generated_hellen121nissan.h | 6 +- .../generated/rusefi_generated_hellen121vag.h | 6 +- .../generated/rusefi_generated_hellen128.h | 6 +- .../rusefi_generated_hellen154hyundai.h | 6 +- .../rusefi_generated_hellen154hyundai_f7.h | 6 +- .../generated/rusefi_generated_hellen72.h | 6 +- .../generated/rusefi_generated_hellen81.h | 6 +- .../generated/rusefi_generated_hellen88bmw.h | 6 +- .../generated/rusefi_generated_hellenNA6.h | 6 +- .../generated/rusefi_generated_hellenNA8_96.h | 6 +- .../generated/rusefi_generated_m74_9.h | 6 +- .../rusefi_generated_mre-legacy_f4.h | 6 +- .../generated/rusefi_generated_mre_f4.h | 6 +- .../generated/rusefi_generated_mre_f7.h | 6 +- .../generated/rusefi_generated_nucleo_f413.h | 6 +- .../rusefi_generated_prometheus_405.h | 6 +- .../rusefi_generated_prometheus_469.h | 6 +- .../generated/rusefi_generated_proteus_f4.h | 6 +- .../generated/rusefi_generated_proteus_f7.h | 6 +- .../generated/rusefi_generated_proteus_h7.h | 6 +- .../generated/rusefi_generated_s105.h | 6 +- .../rusefi_generated_small-can-board.h | 6 +- .../rusefi_generated_stm32f429_nucleo.h | 6 +- .../rusefi_generated_stm32f767_nucleo.h | 6 +- .../rusefi_generated_stm32h743_nucleo.h | 6 +- .../rusefi_generated_subaru_eg33_f7.h | 6 +- .../generated/rusefi_generated_t-b-g.h | 6 +- .../generated/rusefi_generated_tdg-pdm8.h | 6 +- .../generated/rusefi_generated_uaefi.h | 6 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-4chan_f7.h | 4 +- .../generated/signature_alphax-8chan-revA.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../generated/signature_alphax-8chan_f7.h | 4 +- .../generated/signature_at_start_f435.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_f469-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../controllers/generated/signature_haba208.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_hellen154hyundai_f7.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_m74_9.h | 4 +- .../generated/signature_mre-legacy_f4.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_nucleo_f413.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_small-can-board.h | 4 +- .../generated/signature_stm32f429_nucleo.h | 4 +- .../generated/signature_stm32f767_nucleo.h | 4 +- .../generated/signature_stm32h743_nucleo.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../controllers/generated/signature_t-b-g.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../controllers/generated/signature_uaefi.h | 4 +- .../lua/generated/output_lookup_generated.cpp | 5 + .../trigger/trigger_central_generated.h | 10 +- firmware/tunerstudio/generated/rusefi.ini | 331 +++++++++--------- .../generated/rusefi_alphax-2chan.ini | 331 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 331 +++++++++--------- .../generated/rusefi_alphax-4chan_f7.ini | 331 +++++++++--------- .../generated/rusefi_alphax-8chan-revA.ini | 331 +++++++++--------- .../generated/rusefi_alphax-8chan.ini | 331 +++++++++--------- .../generated/rusefi_alphax-8chan_f7.ini | 331 +++++++++--------- .../generated/rusefi_at_start_f435.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 331 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 331 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 331 +++++++++--------- .../generated/rusefi_f469-discovery.ini | 331 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_haba208.ini | 331 +++++++++--------- .../generated/rusefi_hellen-112-17.ini | 331 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 331 +++++++++--------- .../generated/rusefi_hellen-honda-k.ini | 329 ++++++++--------- .../generated/rusefi_hellen-nb1.ini | 331 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 331 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 331 +++++++++--------- .../generated/rusefi_hellen128.ini | 331 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 331 +++++++++--------- .../generated/rusefi_hellen154hyundai_f7.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 331 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 331 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 331 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_m74_9.ini | 331 +++++++++--------- .../generated/rusefi_mre-legacy_f4.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 331 +++++++++--------- .../generated/rusefi_nucleo_f413.ini | 331 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 331 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 331 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 331 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 331 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_s105.ini | 331 +++++++++--------- .../generated/rusefi_small-can-board.ini | 331 +++++++++--------- .../generated/rusefi_stm32f429_nucleo.ini | 331 +++++++++--------- .../generated/rusefi_stm32f767_nucleo.ini | 331 +++++++++--------- .../generated/rusefi_stm32h743_nucleo.ini | 331 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_t-b-g.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 331 +++++++++--------- .../tunerstudio/generated/rusefi_uaefi.ini | 331 +++++++++--------- .../com/rusefi/config/generated/DcMotors.java | 10 +- .../config/generated/ElectronicThrottle.java | 36 +- .../com/rusefi/config/generated/Fields.java | 8 +- .../rusefi/config/generated/IdleState.java | 58 +-- .../config/generated/LambdaMonitor.java | 10 +- .../rusefi/config/generated/SentState.java | 8 +- .../config/generated/TriggerCentral.java | 4 +- .../rusefi/config/generated/TriggerState.java | 26 +- .../config/generated/TriggerStatePrimary.java | 8 +- .../com/rusefi/config/generated/VvtState.java | 8 +- .../config/generated/WallFuelState.java | 6 +- .../config/generated/WidebandController.java | 18 +- 160 files changed, 8501 insertions(+), 8342 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index aa734ce7e9..3a5dd596e3 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -622,6 +622,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 96c8b70279..81fb36e82c 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -353,6 +353,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 7d19a81146..55e8b8a9af 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -57,13 +57,13 @@ LDS_lambda_monitor, #define ENGINE_STATE_BASE_ADDRESS 1112 #define TPS_ACCEL_STATE_BASE_ADDRESS 1212 #define TRIGGER_CENTRAL_BASE_ADDRESS 1260 -#define TRIGGER_STATE_BASE_ADDRESS 1320 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1520 -#define WALL_FUEL_STATE_BASE_ADDRESS 1528 -#define IDLE_STATE_BASE_ADDRESS 1536 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1584 -#define WIDEBAND_STATE_BASE_ADDRESS 1688 -#define DC_MOTORS_BASE_ADDRESS 1712 -#define SENT_STATE_BASE_ADDRESS 1724 -#define VVT_BASE_ADDRESS 1732 -#define LAMBDA_MONITOR_BASE_ADDRESS 1736 +#define TRIGGER_STATE_BASE_ADDRESS 1324 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1524 +#define WALL_FUEL_STATE_BASE_ADDRESS 1532 +#define IDLE_STATE_BASE_ADDRESS 1540 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1588 +#define WIDEBAND_STATE_BASE_ADDRESS 1692 +#define DC_MOTORS_BASE_ADDRESS 1716 +#define SENT_STATE_BASE_ADDRESS 1728 +#define VVT_BASE_ADDRESS 1736 +#define LAMBDA_MONITOR_BASE_ADDRESS 1740 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 84383bcb73..4bf9d5dcfd 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -714,164 +714,165 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 40066167e0..29c37a8677 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -514,135 +514,136 @@ triggerToothAngleError("Sync: trigger angle error", SensorCategory.SENSOR_INPUTS triggerIgnoredToothCount("triggerIgnoredToothCount", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1308, 1.0, -1.0, -1.0, ""), alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1309, 1.0, -20.0, 100.0, "units"), mapCamPrevToothAngle("Sync: MAP: prev angle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 1.0, -3000.0, 3000.0, "deg"), -crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -10000.0, 10000.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), -vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1356, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1357, 1.0, -1.0, -1.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1358, 1.0, -20.0, 100.0, "units"), -crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -10000.0, 10000.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), -vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1356, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1357, 1.0, -1.0, -1.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1358, 1.0, -20.0, 100.0, "units"), -crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -10000.0, 10000.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), -vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1356, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1357, 1.0, -1.0, -1.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1358, 1.0, -20.0, 100.0, "units"), -crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -10000.0, 10000.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), -vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1356, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1357, 1.0, -1.0, -1.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1358, 1.0, -20.0, 100.0, "units"), -crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -10000.0, 10000.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), -vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1356, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1357, 1.0, -1.0, -1.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1358, 1.0, -20.0, 100.0, "units"), -camResyncCounter("sync: Phase Re-Sync Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1520, 1.0, -1.0, -1.0, ""), -alignmentFill_at_1("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1521, 1.0, -20.0, 100.0, "units"), -wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1528, 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, 1532, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1536, 1.0, -1.0, -1.0, ""), -currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1540, 1.0, 0.0, 0.0, "%"), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1544, 1.0, -1.0, -1.0, ""), -idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1548, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1552, 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, 1556, 1.0, -1.0, -1.0, ""), -idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1564, 1.0, -1.0, -1.0, ""), -targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1568, 1.0, -1.0, -1.0, ""), -targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1572, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1576, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1580, 1.0, -1.0, -1.0, ""), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1584, 1.0, 0.0, 10.0, "per"), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1588, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1592, 1.0, 0.0, 3.0, "per"), -m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1596, 1.0, 0.0, 3.0, "per"), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1600, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1604, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1608, 1.0, -10000.0, 10000.0, "%"), -etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -10000.0, 10000.0, "%"), -etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1620, 1.0, 0.0, 25.0, "per"), -etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1624, 1.0, -20.0, 50.0, "per"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1628, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1630, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1632, 1.0, -1.0, -1.0, ""), -tcEtbDrop("tcEtbDrop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1633, 1.0, -1.0, -1.0, ""), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1634, 0.01, 0.0, 100.0, "sec"), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1584, 1.0, 0.0, 10.0, "per"), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1588, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1592, 1.0, 0.0, 3.0, "per"), -m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1596, 1.0, 0.0, 3.0, "per"), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1600, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1604, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1608, 1.0, -10000.0, 10000.0, "%"), -etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -10000.0, 10000.0, "%"), -etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1620, 1.0, 0.0, 25.0, "per"), -etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1624, 1.0, -20.0, 50.0, "per"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1628, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1630, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1632, 1.0, -1.0, -1.0, ""), -tcEtbDrop("tcEtbDrop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1633, 1.0, -1.0, -1.0, ""), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1634, 0.01, 0.0, 100.0, "sec"), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1688, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1689, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1690, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1691, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1692, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1694, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1696, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1698, 1.0, -20.0, 100.0, "units"), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1688, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1689, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1690, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1691, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1692, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1694, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1696, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1698, 1.0, -20.0, 100.0, "units"), -dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1712, 1.0, 0.0, 10.0, "per"), -isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1716, 1.0, 0.0, 10.0, "per"), -alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1717, 1.0, -20.0, 100.0, "units"), -value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1724, 1.0, 0.0, 3.0, "value"), -value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1726, 1.0, 0.0, 3.0, "value"), -errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1728, 1.0, 0.0, 3.0, "ratio"), -vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1732, 0.1, -90.0, 90.0, "deg"), -vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1734, 0.5, 100.0, 1.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1735, 1.0, -20.0, 100.0, "units"), -lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1740, 0.01, 0.0, 1.0, "sec"), -alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1742, 1.0, -20.0, 100.0, "units"), +triggerElapsedUs("triggerElapsedUs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), +crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -10000.0, 10000.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), +vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1360, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1361, 1.0, -1.0, -1.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1362, 1.0, -20.0, 100.0, "units"), +crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -10000.0, 10000.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), +vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1360, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1361, 1.0, -1.0, -1.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1362, 1.0, -20.0, 100.0, "units"), +crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -10000.0, 10000.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), +vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1360, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1361, 1.0, -1.0, -1.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1362, 1.0, -20.0, 100.0, "units"), +crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -10000.0, 10000.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), +vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1360, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1361, 1.0, -1.0, -1.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1362, 1.0, -20.0, 100.0, "units"), +crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -10000.0, 10000.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -10000.0, 10000.0, "sync: Primary Cam Position"), +vvtToothPosition1("vvtToothPosition 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition2("vvtToothPosition 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1360, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1361, 1.0, -1.0, -1.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1362, 1.0, -20.0, 100.0, "units"), +camResyncCounter("sync: Phase Re-Sync Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1524, 1.0, -1.0, -1.0, ""), +alignmentFill_at_1("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1525, 1.0, -20.0, 100.0, "units"), +wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1532, 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, 1536, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1540, 1.0, -1.0, -1.0, ""), +currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1544, 1.0, 0.0, 0.0, "%"), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1548, 1.0, -1.0, -1.0, ""), +idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1552, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1556, 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, 1560, 1.0, -1.0, -1.0, ""), +idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1568, 1.0, -1.0, -1.0, ""), +targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1572, 1.0, -1.0, -1.0, ""), +targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1576, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1580, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1584, 1.0, -1.0, -1.0, ""), +idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1588, 1.0, 0.0, 10.0, "per"), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1592, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1596, 1.0, 0.0, 3.0, "per"), +m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1600, 1.0, 0.0, 3.0, "per"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1604, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1608, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -10000.0, 10000.0, "%"), +etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1616, 1.0, -10000.0, 10000.0, "%"), +etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1624, 1.0, 0.0, 25.0, "per"), +etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1628, 1.0, -20.0, 50.0, "per"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1632, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1634, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1636, 1.0, -1.0, -1.0, ""), +tcEtbDrop("tcEtbDrop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1637, 1.0, -1.0, -1.0, ""), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1638, 0.01, 0.0, 100.0, "sec"), +idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1588, 1.0, 0.0, 10.0, "per"), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1592, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1596, 1.0, 0.0, 3.0, "per"), +m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1600, 1.0, 0.0, 3.0, "per"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1604, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1608, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -10000.0, 10000.0, "%"), +etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1616, 1.0, -10000.0, 10000.0, "%"), +etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1624, 1.0, 0.0, 25.0, "per"), +etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1628, 1.0, -20.0, 50.0, "per"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1632, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1634, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1636, 1.0, -1.0, -1.0, ""), +tcEtbDrop("tcEtbDrop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1637, 1.0, -1.0, -1.0, ""), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1638, 0.01, 0.0, 100.0, "sec"), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1692, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1693, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1694, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1695, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1696, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1698, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1700, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1702, 1.0, -20.0, 100.0, "units"), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1692, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1693, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1694, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1695, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1696, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1698, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1700, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1702, 1.0, -20.0, 100.0, "units"), +dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1716, 1.0, 0.0, 10.0, "per"), +isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1720, 1.0, 0.0, 10.0, "per"), +alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1721, 1.0, -20.0, 100.0, "units"), +value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1728, 1.0, 0.0, 3.0, "value"), +value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1730, 1.0, 0.0, 3.0, "value"), +errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1732, 1.0, 0.0, 3.0, "ratio"), +vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1736, 0.1, -90.0, 90.0, "deg"), +vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1738, 0.5, 100.0, 1.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1739, 1.0, -20.0, 100.0, "units"), +lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1744, 0.01, 0.0, 1.0, "sec"), +alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1746, 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 a95d974cac..6e99f5e688 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 1744 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1748 \ No newline at end of file diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 1a3ad70795..c05888e411 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -504,6 +504,9 @@ static const LogField fields[] = { #if EFI_SHAFT_POSITION_INPUT {engine->triggerCentral.mapCamPrevToothAngle, "Sync: MAP: prev angle", "deg", 2}, #endif +#if EFI_SHAFT_POSITION_INPUT + {engine->triggerCentral.triggerElapsedUs, "triggerElapsedUs", "", 0}, +#endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL {___engine.module().unmock().currentIdlePosition, "Idle: Position", "%", 1}, #endif diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 1a6b2eb75c..a4e4c6a063 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3978174926 +#define SIGNATURE_HASH 2538081924 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-2chan.3978174926" +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-2chan.2538081924" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index 1921fedc2e..150b1adecb 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1267,7 +1267,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3082566784 +#define SIGNATURE_HASH 3454669770 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1653,14 +1653,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-4chan.3082566784" +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-4chan.3454669770" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 0f69f970be..d2644f4d43 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1267,7 +1267,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3082566784 +#define SIGNATURE_HASH 3454669770 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1653,14 +1653,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-4chan_f7.3082566784" +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-4chan_f7.3454669770" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index 1d2c5d1de1..e4588f4959 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4230493869 +#define SIGNATURE_HASH 2256411111 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan-revA.4230493869" +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan-revA.2256411111" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index 8547bda154..e2d4e74bbd 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3347384573 +#define SIGNATURE_HASH 3184732087 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan.3347384573" +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan.3184732087" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index d4ee4c9ab0..1a09165c2a 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3347384573 +#define SIGNATURE_HASH 3184732087 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan_f7.3347384573" +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan_f7.3184732087" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index d106c50b1c..aa4bc43279 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2881731898 +#define SIGNATURE_HASH 3516240496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.at_start_f435.2881731898" +#define TS_SIGNATURE "rusEFI master.2024.05.07.at_start_f435.3516240496" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index 72aac83822..42b749d230 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4022626676 +#define SIGNATURE_HASH 2509391422 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.atlas.4022626676" +#define TS_SIGNATURE "rusEFI master.2024.05.07.atlas.2509391422" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 6873dbecdc..ff467f43c9 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 261244507 +#define SIGNATURE_HASH 1975806225 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.f407-discovery.261244507" +#define TS_SIGNATURE "rusEFI master.2024.05.07.f407-discovery.1975806225" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index f942769798..aff66627cc 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2881731898 +#define SIGNATURE_HASH 3516240496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.f429-discovery.2881731898" +#define TS_SIGNATURE "rusEFI master.2024.05.07.f429-discovery.3516240496" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index 6554e73b0f..ec1f174457 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2568272809 +#define SIGNATURE_HASH 3812791523 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.f469-discovery.2568272809" +#define TS_SIGNATURE "rusEFI master.2024.05.07.f469-discovery.3812791523" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index 543ace5c6d..58bc48bed6 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 4248881441 +#define SIGNATURE_HASH 2266424939 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.frankenso_na6.4248881441" +#define TS_SIGNATURE "rusEFI master.2024.05.07.frankenso_na6.2266424939" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index a337f9ddd2..8dc280019b 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2881731898 +#define SIGNATURE_HASH 3516240496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.haba208.2881731898" +#define TS_SIGNATURE "rusEFI master.2024.05.07.haba208.3516240496" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index da7ef62bcb..d1041bf4b0 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 583738814 +#define SIGNATURE_HASH 1486686964 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-112-17.583738814" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-112-17.1486686964" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index e65bcedbd6..301546eb94 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1740298882 +#define SIGNATURE_HASH 502068680 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-gm-e67.1740298882" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-gm-e67.502068680" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index f836e9091d..8bd03adaf8 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1534226426 +#define SIGNATURE_HASH 556023984 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1654,14 +1654,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-honda-k.1534226426" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-honda-k.556023984" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index c6443e0df6..f7b9bf0fa7 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1121667866 +#define SIGNATURE_HASH 948790352 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-nb1.1121667866" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-nb1.948790352" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 4d791de15e..faa8a18032 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4002291601 +#define SIGNATURE_HASH 2497196251 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen121nissan.4002291601" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen121nissan.2497196251" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index 6189873353..613e625968 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2612699356 +#define SIGNATURE_HASH 3790376854 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen121vag.2612699356" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen121vag.3790376854" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index 6b4490bb9f..89ec2c0d92 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1179752397 +#define SIGNATURE_HASH 1007138951 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen128.1179752397" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen128.1007138951" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index 4c6c8d7828..5836fd893a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1480074573 +#define SIGNATURE_HASH 577636871 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen154hyundai.1480074573" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen154hyundai.577636871" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index 937c45fcbd..ea741e56df 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2855392690 +#define SIGNATURE_HASH 3496475384 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen154hyundai_f7.2855392690" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen154hyundai_f7.3496475384" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index 9147ca9583..a9abd6c45e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 723667366 +#define SIGNATURE_HASH 1366583020 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen72.723667366" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen72.1366583020" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index f8e750ce3d..1029cfcc36 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3461557724 +#define SIGNATURE_HASH 3020227222 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen81.3461557724" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen81.3020227222" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 864e89baa0..c7b3f2a80f 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3648010399 +#define SIGNATURE_HASH 2737182677 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output false -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen88bmw.3648010399" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen88bmw.2737182677" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 1377b6c828..5d61b33948 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1063673562 +#define SIGNATURE_HASH 1160802704 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellenNA6.1063673562" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellenNA6.1160802704" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 05fdd928b5..e334ece9c8 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1267,7 +1267,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3233553428 +#define SIGNATURE_HASH 3135910750 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1653,14 +1653,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellenNA8_96.3233553428" +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellenNA8_96.3135910750" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 4b33d13369..f9fc3bab80 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 528057829 +#define SIGNATURE_HASH 1697622703 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.m74_9.528057829" +#define TS_SIGNATURE "rusEFI master.2024.05.07.m74_9.1697622703" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h index 06c2b1e4d6..81f47758eb 100644 --- a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3852125460 +#define SIGNATURE_HASH 2681006686 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.mre-legacy_f4.3852125460" +#define TS_SIGNATURE "rusEFI master.2024.05.07.mre-legacy_f4.2681006686" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index d5cc7db3bc..ecd8995b3a 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3852125460 +#define SIGNATURE_HASH 2681006686 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.mre_f4.3852125460" +#define TS_SIGNATURE "rusEFI master.2024.05.07.mre_f4.2681006686" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 6716c115bd..38b0276850 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1266,7 +1266,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3852125460 +#define SIGNATURE_HASH 2681006686 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.mre_f7.3852125460" +#define TS_SIGNATURE "rusEFI master.2024.05.07.mre_f7.2681006686" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index 9dfdfdb68a..c577ec85be 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2881731898 +#define SIGNATURE_HASH 3516240496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.nucleo_f413.2881731898" +#define TS_SIGNATURE "rusEFI master.2024.05.07.nucleo_f413.3516240496" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_405.h b/firmware/controllers/generated/rusefi_generated_prometheus_405.h index 4bb5ca7d21..aaa32060e0 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_405.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_405.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2606198954 +#define SIGNATURE_HASH 3774963680 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.prometheus_405.2606198954" +#define TS_SIGNATURE "rusEFI master.2024.05.07.prometheus_405.3774963680" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_469.h b/firmware/controllers/generated/rusefi_generated_prometheus_469.h index 1d809e829a..4fdebb6615 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_469.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_469.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2606198954 +#define SIGNATURE_HASH 3774963680 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.prometheus_469.2606198954" +#define TS_SIGNATURE "rusEFI master.2024.05.07.prometheus_469.3774963680" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index c9d9eb7d2e..2f023409ea 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1104676632 +#define SIGNATURE_HASH 999172178 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_f4.1104676632" +#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_f4.999172178" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index 404c5da525..c901429ed9 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1104676632 +#define SIGNATURE_HASH 999172178 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_f7.1104676632" +#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_f7.999172178" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index 18ca1d561d..f650f83c6d 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1104676632 +#define SIGNATURE_HASH 999172178 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_h7.1104676632" +#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_h7.999172178" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index 43727ef07a..2cc6340dc0 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 340278776 +#define SIGNATURE_HASH 1847464626 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.s105.340278776" +#define TS_SIGNATURE "rusEFI master.2024.05.07.s105.1847464626" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index 625bf973ad..01688093f3 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1266,7 +1266,7 @@ #define show_Proteus_presets false #define show_small_can_board_presets true #define show_test_presets false -#define SIGNATURE_HASH 221159192 +#define SIGNATURE_HASH 2004398162 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1653,14 +1653,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.small-can-board.221159192" +#define TS_SIGNATURE "rusEFI master.2024.05.07.small-can-board.2004398162" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 241db71baa..d692b15820 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2881731898 +#define SIGNATURE_HASH 3516240496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32f429_nucleo.2881731898" +#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32f429_nucleo.3516240496" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index 1a43234609..6f4b37e012 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2881731898 +#define SIGNATURE_HASH 3516240496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32f767_nucleo.2881731898" +#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32f767_nucleo.3516240496" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index 9be7da8d04..26abfe509a 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2881731898 +#define SIGNATURE_HASH 3516240496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32h743_nucleo.2881731898" +#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32h743_nucleo.3516240496" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h index c83a9803ba..c924c7d5e6 100644 --- a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3779963145 +#define SIGNATURE_HASH 2602272323 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.subaru_eg33_f7.3779963145" +#define TS_SIGNATURE "rusEFI master.2024.05.07.subaru_eg33_f7.2602272323" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index c80a93a2d2..20f611a7a2 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2881731898 +#define SIGNATURE_HASH 3516240496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.t-b-g.2881731898" +#define TS_SIGNATURE "rusEFI master.2024.05.07.t-b-g.3516240496" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index 270f3e6278..31a6db44e9 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1265,7 +1265,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2448294322 +#define SIGNATURE_HASH 3954716408 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1651,14 +1651,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.tdg-pdm8.2448294322" +#define TS_SIGNATURE "rusEFI master.2024.05.07.tdg-pdm8.3954716408" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 4889a89e34..b80fa6f6de 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1266,7 +1266,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_uaefi_presets true -#define SIGNATURE_HASH 3518611457 +#define SIGNATURE_HASH 2884628299 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1652,14 +1652,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.05.07.uaefi.3518611457" +#define TS_SIGNATURE "rusEFI master.2024.05.07.uaefi.2884628299" #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 1744 +#define TS_TOTAL_OUTPUT_SIZE 1748 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 2732d80118..c0f6ffcf47 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3978174926 -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-2chan.3978174926" +#define SIGNATURE_HASH 2538081924 +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-2chan.2538081924" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index cb9ded9e88..cf77abe4aa 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3082566784 -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-4chan.3082566784" +#define SIGNATURE_HASH 3454669770 +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-4chan.3454669770" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index c5acbfcad8..e2ab9ac808 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3082566784 -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-4chan_f7.3082566784" +#define SIGNATURE_HASH 3454669770 +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-4chan_f7.3454669770" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index ef4b80a766..8ec3e96248 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4230493869 -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan-revA.4230493869" +#define SIGNATURE_HASH 2256411111 +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan-revA.2256411111" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 640adff8ed..c8d3bf8615 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3347384573 -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan.3347384573" +#define SIGNATURE_HASH 3184732087 +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan.3184732087" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index e5a6198ef6..8383b95aee 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3347384573 -#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan_f7.3347384573" +#define SIGNATURE_HASH 3184732087 +#define TS_SIGNATURE "rusEFI master.2024.05.07.alphax-8chan_f7.3184732087" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 99e240dd5d..69b45e0dd0 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2881731898 -#define TS_SIGNATURE "rusEFI master.2024.05.07.at_start_f435.2881731898" +#define SIGNATURE_HASH 3516240496 +#define TS_SIGNATURE "rusEFI master.2024.05.07.at_start_f435.3516240496" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 65e7d24db0..8ff3cf9cc8 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4022626676 -#define TS_SIGNATURE "rusEFI master.2024.05.07.atlas.4022626676" +#define SIGNATURE_HASH 2509391422 +#define TS_SIGNATURE "rusEFI master.2024.05.07.atlas.2509391422" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index a7acc4033a..6275247645 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 261244507 -#define TS_SIGNATURE "rusEFI master.2024.05.07.f407-discovery.261244507" +#define SIGNATURE_HASH 1975806225 +#define TS_SIGNATURE "rusEFI master.2024.05.07.f407-discovery.1975806225" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index d3e8487b10..b603e1de4b 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2881731898 -#define TS_SIGNATURE "rusEFI master.2024.05.07.f429-discovery.2881731898" +#define SIGNATURE_HASH 3516240496 +#define TS_SIGNATURE "rusEFI master.2024.05.07.f429-discovery.3516240496" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index d8c4df8830..ec47edb41a 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2568272809 -#define TS_SIGNATURE "rusEFI master.2024.05.07.f469-discovery.2568272809" +#define SIGNATURE_HASH 3812791523 +#define TS_SIGNATURE "rusEFI master.2024.05.07.f469-discovery.3812791523" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 002983d455..547c81ebfe 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4248881441 -#define TS_SIGNATURE "rusEFI master.2024.05.07.frankenso_na6.4248881441" +#define SIGNATURE_HASH 2266424939 +#define TS_SIGNATURE "rusEFI master.2024.05.07.frankenso_na6.2266424939" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index 22aaf43338..738169f1ab 100644 --- a/firmware/controllers/generated/signature_haba208.h +++ b/firmware/controllers/generated/signature_haba208.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2881731898 -#define TS_SIGNATURE "rusEFI master.2024.05.07.haba208.2881731898" +#define SIGNATURE_HASH 3516240496 +#define TS_SIGNATURE "rusEFI master.2024.05.07.haba208.3516240496" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index a3b97c65c3..77c24b1d87 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 583738814 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-112-17.583738814" +#define SIGNATURE_HASH 1486686964 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-112-17.1486686964" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 9ef9b66612..83ad53ced5 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1740298882 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-gm-e67.1740298882" +#define SIGNATURE_HASH 502068680 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-gm-e67.502068680" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index e8ee88b4a9..a27f044df6 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1534226426 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-honda-k.1534226426" +#define SIGNATURE_HASH 556023984 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-honda-k.556023984" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 87b457c83b..4ed6778beb 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1121667866 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-nb1.1121667866" +#define SIGNATURE_HASH 948790352 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen-nb1.948790352" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 2d8ba9ebbf..475c3306aa 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4002291601 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen121nissan.4002291601" +#define SIGNATURE_HASH 2497196251 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen121nissan.2497196251" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 172e93bdd6..16f7021400 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2612699356 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen121vag.2612699356" +#define SIGNATURE_HASH 3790376854 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen121vag.3790376854" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index e5e5a3472c..469dd36e93 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1179752397 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen128.1179752397" +#define SIGNATURE_HASH 1007138951 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen128.1007138951" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 7de6f1b078..3970829471 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1480074573 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen154hyundai.1480074573" +#define SIGNATURE_HASH 577636871 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen154hyundai.577636871" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index e28900bcbd..de5602dacc 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/signature_hellen154hyundai_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2855392690 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen154hyundai_f7.2855392690" +#define SIGNATURE_HASH 3496475384 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen154hyundai_f7.3496475384" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 3787b8a874..3e79930273 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 723667366 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen72.723667366" +#define SIGNATURE_HASH 1366583020 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen72.1366583020" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 2ad3a4e3a6..a3bcb571a4 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3461557724 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen81.3461557724" +#define SIGNATURE_HASH 3020227222 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen81.3020227222" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 90791ea5f5..cde24621ee 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3648010399 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen88bmw.3648010399" +#define SIGNATURE_HASH 2737182677 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellen88bmw.2737182677" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 1425a8ead6..d4a4283091 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1063673562 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellenNA6.1063673562" +#define SIGNATURE_HASH 1160802704 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellenNA6.1160802704" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index ac2223dcbf..1033d021d6 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3233553428 -#define TS_SIGNATURE "rusEFI master.2024.05.07.hellenNA8_96.3233553428" +#define SIGNATURE_HASH 3135910750 +#define TS_SIGNATURE "rusEFI master.2024.05.07.hellenNA8_96.3135910750" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 6cd02f1a48..c77dde002b 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 528057829 -#define TS_SIGNATURE "rusEFI master.2024.05.07.m74_9.528057829" +#define SIGNATURE_HASH 1697622703 +#define TS_SIGNATURE "rusEFI master.2024.05.07.m74_9.1697622703" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index 4e90fd7a13..86ede35fe3 100644 --- a/firmware/controllers/generated/signature_mre-legacy_f4.h +++ b/firmware/controllers/generated/signature_mre-legacy_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3852125460 -#define TS_SIGNATURE "rusEFI master.2024.05.07.mre-legacy_f4.3852125460" +#define SIGNATURE_HASH 2681006686 +#define TS_SIGNATURE "rusEFI master.2024.05.07.mre-legacy_f4.2681006686" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 224c867114..ef201f0f54 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3852125460 -#define TS_SIGNATURE "rusEFI master.2024.05.07.mre_f4.3852125460" +#define SIGNATURE_HASH 2681006686 +#define TS_SIGNATURE "rusEFI master.2024.05.07.mre_f4.2681006686" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 4e04d62930..2950e4fe8f 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3852125460 -#define TS_SIGNATURE "rusEFI master.2024.05.07.mre_f7.3852125460" +#define SIGNATURE_HASH 2681006686 +#define TS_SIGNATURE "rusEFI master.2024.05.07.mre_f7.2681006686" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index ccbb52854f..e4598fb73c 100644 --- a/firmware/controllers/generated/signature_nucleo_f413.h +++ b/firmware/controllers/generated/signature_nucleo_f413.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2881731898 -#define TS_SIGNATURE "rusEFI master.2024.05.07.nucleo_f413.2881731898" +#define SIGNATURE_HASH 3516240496 +#define TS_SIGNATURE "rusEFI master.2024.05.07.nucleo_f413.3516240496" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 33a3872104..50984dcce2 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2606198954 -#define TS_SIGNATURE "rusEFI master.2024.05.07.prometheus_405.2606198954" +#define SIGNATURE_HASH 3774963680 +#define TS_SIGNATURE "rusEFI master.2024.05.07.prometheus_405.3774963680" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a4e261053d..23b67f32bb 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2606198954 -#define TS_SIGNATURE "rusEFI master.2024.05.07.prometheus_469.2606198954" +#define SIGNATURE_HASH 3774963680 +#define TS_SIGNATURE "rusEFI master.2024.05.07.prometheus_469.3774963680" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index c91264e586..fc3190b3fc 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1104676632 -#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_f4.1104676632" +#define SIGNATURE_HASH 999172178 +#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_f4.999172178" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 4c545ed2f8..40cd1ed134 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1104676632 -#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_f7.1104676632" +#define SIGNATURE_HASH 999172178 +#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_f7.999172178" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 47bad267af..8e02830a4a 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1104676632 -#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_h7.1104676632" +#define SIGNATURE_HASH 999172178 +#define TS_SIGNATURE "rusEFI master.2024.05.07.proteus_h7.999172178" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index ef8f5ff3bd..269eb7d465 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 340278776 -#define TS_SIGNATURE "rusEFI master.2024.05.07.s105.340278776" +#define SIGNATURE_HASH 1847464626 +#define TS_SIGNATURE "rusEFI master.2024.05.07.s105.1847464626" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index dc6cc577e6..aad5c53607 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 221159192 -#define TS_SIGNATURE "rusEFI master.2024.05.07.small-can-board.221159192" +#define SIGNATURE_HASH 2004398162 +#define TS_SIGNATURE "rusEFI master.2024.05.07.small-can-board.2004398162" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index adb8468881..e4296bde4c 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2881731898 -#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32f429_nucleo.2881731898" +#define SIGNATURE_HASH 3516240496 +#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32f429_nucleo.3516240496" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index a1b76c0768..6e098bc43f 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2881731898 -#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32f767_nucleo.2881731898" +#define SIGNATURE_HASH 3516240496 +#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32f767_nucleo.3516240496" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index 087a229898..8ea0d74616 100644 --- a/firmware/controllers/generated/signature_stm32h743_nucleo.h +++ b/firmware/controllers/generated/signature_stm32h743_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2881731898 -#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32h743_nucleo.2881731898" +#define SIGNATURE_HASH 3516240496 +#define TS_SIGNATURE "rusEFI master.2024.05.07.stm32h743_nucleo.3516240496" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index bb0f5fe96d..400a558a3b 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3779963145 -#define TS_SIGNATURE "rusEFI master.2024.05.07.subaru_eg33_f7.3779963145" +#define SIGNATURE_HASH 2602272323 +#define TS_SIGNATURE "rusEFI master.2024.05.07.subaru_eg33_f7.2602272323" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 6e77e5404b..e5d03a4e9b 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2881731898 -#define TS_SIGNATURE "rusEFI master.2024.05.07.t-b-g.2881731898" +#define SIGNATURE_HASH 3516240496 +#define TS_SIGNATURE "rusEFI master.2024.05.07.t-b-g.3516240496" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index ed58b8d9d5..a8ffb38541 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-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2448294322 -#define TS_SIGNATURE "rusEFI master.2024.05.07.tdg-pdm8.2448294322" +#define SIGNATURE_HASH 3954716408 +#define TS_SIGNATURE "rusEFI master.2024.05.07.tdg-pdm8.3954716408" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 5accf1783a..27c21be78d 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3518611457 -#define TS_SIGNATURE "rusEFI master.2024.05.07.uaefi.3518611457" +#define SIGNATURE_HASH 2884628299 +#define TS_SIGNATURE "rusEFI master.2024.05.07.uaefi.2884628299" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index df6d177b96..845bf2ee49 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1316,6 +1316,11 @@ float getOutputValueByName(const char *name) { case 756216589: return engine->triggerCentral.isDecodingMapCam; #endif +// triggerElapsedUs +#if EFI_SHAFT_POSITION_INPUT + case 767689023: + return engine->triggerCentral.triggerElapsedUs; +#endif // idleState #if EFI_PROD_CODE && EFI_IDLE_CONTROL case 1886060228: diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h index 340121a04c..8e7aadd737 100644 --- a/firmware/controllers/trigger/trigger_central_generated.h +++ b/firmware/controllers/trigger/trigger_central_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Wed Jan 03 20:30:10 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -162,8 +162,12 @@ struct trigger_central_s { /** offset 56 bit 31 */ bool unusedBit_13_31 : 1 {}; + /** + * offset 60 + */ + uint32_t triggerElapsedUs = (uint32_t)0; }; -static_assert(sizeof(trigger_central_s) == 60); +static_assert(sizeof(trigger_central_s) == 64); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Wed Jan 03 20:30:10 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue May 07 17:41:25 UTC 2024 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 8e4ee28cce..a9c0099201 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.f407-discovery.261244507" + signature = "rusEFI master.2024.05.07.f407-discovery.1975806225" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.f407-discovery.261244507" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.f407-discovery.1975806225" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:25 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:57 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5659,6 +5660,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6698,6 +6700,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 97d5475016..33a0930737 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.alphax-2chan.3978174926" + signature = "rusEFI master.2024.05.07.alphax-2chan.2538081924" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.alphax-2chan.3978174926" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.alphax-2chan.2538081924" ; 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 @@ -100,7 +100,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","INVALID","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2","X7 - AIN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:11 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:43 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6691,6 +6693,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 79ffe7a47e..e581b5d842 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.alphax-4chan.3082566784" + signature = "rusEFI master.2024.05.07.alphax-4chan.3454669770" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.alphax-4chan.3082566784" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.alphax-4chan.3454669770" ; 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 @@ -100,7 +100,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","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:21 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:52 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5659,6 +5660,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6712,6 +6714,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 2e7d9b5517..3abe5d4ef7 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.alphax-4chan_f7.3082566784" + signature = "rusEFI master.2024.05.07.alphax-4chan_f7.3454669770" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.alphax-4chan_f7.3082566784" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.alphax-4chan_f7.3454669770" ; 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 @@ -100,7 +100,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","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:20 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:51 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5659,6 +5660,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6712,6 +6714,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 8ea5c17136..5cd619fadc 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.alphax-8chan-revA.4230493869" + signature = "rusEFI master.2024.05.07.alphax-8chan-revA.2256411111" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.alphax-8chan-revA.4230493869" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.alphax-8chan-revA.2256411111" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:29 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:01 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 00010d1d06..90c57059d4 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.alphax-8chan.3347384573" + signature = "rusEFI master.2024.05.07.alphax-8chan.3184732087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.alphax-8chan.3347384573" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.alphax-8chan.3184732087" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:35 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:07 UTC 2024 pageSize = 22672 page = 1 @@ -2515,7 +2515,7 @@ tcu_shiftTime = scalar, F32, 22668, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3246,167 +3246,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5661,6 +5662,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6698,6 +6700,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 7689ef3c33..4e898f1d28 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.alphax-8chan_f7.3347384573" + signature = "rusEFI master.2024.05.07.alphax-8chan_f7.3184732087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.alphax-8chan_f7.3347384573" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.alphax-8chan_f7.3184732087" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:36 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:08 UTC 2024 pageSize = 22672 page = 1 @@ -2515,7 +2515,7 @@ tcu_shiftTime = scalar, F32, 22668, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3246,167 +3246,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5661,6 +5662,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6698,6 +6700,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 277faaf026..dfd3e9ba7d 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.at_start_f435.2881731898" + signature = "rusEFI master.2024.05.07.at_start_f435.3516240496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.at_start_f435.2881731898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.at_start_f435.3516240496" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:17 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:49 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index aafd28ec66..47ddb39204 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.atlas.4022626676" + signature = "rusEFI master.2024.05.07.atlas.2509391422" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.atlas.4022626676" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.atlas.2509391422" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:15 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:48 UTC 2024 pageSize = 22156 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22152, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index affde0cf3d..74bd573dfc 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.f407-discovery.261244507" + signature = "rusEFI master.2024.05.07.f407-discovery.1975806225" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.f407-discovery.261244507" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.f407-discovery.1975806225" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:09 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:41 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5659,6 +5660,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6698,6 +6700,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index a26dd06f8a..0b29228fa7 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.f429-discovery.2881731898" + signature = "rusEFI master.2024.05.07.f429-discovery.3516240496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.f429-discovery.2881731898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.f429-discovery.3516240496" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:18 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:50 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index fd256bf1ab..62dd73436d 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.f469-discovery.2568272809" + signature = "rusEFI master.2024.05.07.f469-discovery.3812791523" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.f469-discovery.2568272809" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.f469-discovery.3812791523" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:08 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:40 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index bbcab2c679..3f7a696f2f 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.frankenso_na6.4248881441" + signature = "rusEFI master.2024.05.07.frankenso_na6.2266424939" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.frankenso_na6.4248881441" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.frankenso_na6.2266424939" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:00 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:31 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index b9f0f6ac0e..61fcf4b442 100644 --- a/firmware/tunerstudio/generated/rusefi_haba208.ini +++ b/firmware/tunerstudio/generated/rusefi_haba208.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.haba208.2881731898" + signature = "rusEFI master.2024.05.07.haba208.3516240496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.haba208.2881731898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.haba208.3516240496" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:02 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:35 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 334e8e0ffb..afa2057614 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen-112-17.583738814" + signature = "rusEFI master.2024.05.07.hellen-112-17.1486686964" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen-112-17.583738814" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen-112-17.1486686964" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","B20 TPS Throttle Position 2","A14 Analog Input","INVALID","A21 PPS1","B03 TPS Throttle Position 1","INVALID","A07 TODO","A12 Analog Input","A10 Analog Input","INVALID","B19 MAP","A09 Analog Input","B15 CLT","B27 IAT","A11 Analog Input","A19 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:09 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:40 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6691,6 +6693,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 86ebf9979a..788d0000d5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen-gm-e67.1740298882" + signature = "rusEFI master.2024.05.07.hellen-gm-e67.502068680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen-gm-e67.1740298882" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen-gm-e67.502068680" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:13 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:44 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 0f59236dc8..770b534b7a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -4,12 +4,12 @@ enable2ndByteCanID = false [SettingGroups] [MegaTune] - signature = "rusEFI master.2024.05.07.hellen-honda-k.1534226426" + signature = "rusEFI master.2024.05.07.hellen-honda-k.556023984" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen-honda-k.1534226426" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen-honda-k.556023984" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -2451,7 +2451,7 @@ tcu_shiftTime = scalar, F32, 23324, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" - ochBlockSize = 1744 + ochBlockSize = 1748 scatteredOchGetCommand = 9 scatteredOffsetArray = highSpeedOffsets @@ -3174,167 +3174,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5512,6 +5513,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6499,6 +6501,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 1febd39247..ee31e50ed5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen-nb1.1121667866" + signature = "rusEFI master.2024.05.07.hellen-nb1.948790352" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen-nb1.1121667866" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen-nb1.948790352" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:28 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:59 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 45086f5200..bac7fa1f70 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen121nissan.4002291601" + signature = "rusEFI master.2024.05.07.hellen121nissan.2497196251" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen121nissan.4002291601" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen121nissan.2497196251" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:23 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:54 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6691,6 +6693,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 9b8ea49283..dd72ffc709 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen121vag.2612699356" + signature = "rusEFI master.2024.05.07.hellen121vag.3790376854" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen121vag.2612699356" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen121vag.3790376854" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:07 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:38 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 453011c2a6..29c9b0676a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen128.1179752397" + signature = "rusEFI master.2024.05.07.hellen128.1007138951" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen128.1179752397" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen128.1007138951" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:33 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:05 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index ebe6bb0383..704fb42799 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen154hyundai.1480074573" + signature = "rusEFI master.2024.05.07.hellen154hyundai.577636871" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen154hyundai.1480074573" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen154hyundai.577636871" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:40 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:12 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5654,6 +5655,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6670,6 +6672,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index 0201038659..46a398396d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen154hyundai_f7.2855392690" + signature = "rusEFI master.2024.05.07.hellen154hyundai_f7.3496475384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen154hyundai_f7.2855392690" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen154hyundai_f7.3496475384" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:27 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:58 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5654,6 +5655,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6670,6 +6672,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 4f41bc36d1..14c22c2527 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen72.723667366" + signature = "rusEFI master.2024.05.07.hellen72.1366583020" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen72.723667366" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen72.1366583020" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:18 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:50 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 83b4030cf1..09d8b98090 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen81.3461557724" + signature = "rusEFI master.2024.05.07.hellen81.3020227222" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen81.3461557724" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen81.3020227222" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:43 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:15 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6691,6 +6693,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index d81fd9cede..bb8cda41d2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellen88bmw.3648010399" + signature = "rusEFI master.2024.05.07.hellen88bmw.2737182677" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellen88bmw.3648010399" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellen88bmw.2737182677" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:14 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:45 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6689,6 +6691,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index cdda0a573b..2229b6ec0f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellenNA6.1063673562" + signature = "rusEFI master.2024.05.07.hellenNA6.1160802704" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellenNA6.1063673562" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellenNA6.1160802704" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:42 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:14 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index a8f447495b..752bd4a690 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.hellenNA8_96.3233553428" + signature = "rusEFI master.2024.05.07.hellenNA8_96.3135910750" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.hellenNA8_96.3233553428" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.hellenNA8_96.3135910750" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:17 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:48 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index a2e4ba0575..3a9f2232a2 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.m74_9.528057829" + signature = "rusEFI master.2024.05.07.m74_9.1697622703" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.m74_9.528057829" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.m74_9.1697622703" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","MAF/MAP sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Pedal position sensor 1 signal PPS1","Pedal position sensor 2 signal PPS2","ETB TPS position sensor 1 signal","ETB TPS position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:05 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:37 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6695,6 +6697,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index d1a8d9f1a3..906299f687 100644 --- a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.mre-legacy_f4.3852125460" + signature = "rusEFI master.2024.05.07.mre-legacy_f4.2681006686" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.mre-legacy_f4.3852125460" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.mre-legacy_f4.2681006686" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:02 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:33 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5660,6 +5661,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6715,6 +6717,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index e46b839122..fcdcd4e3f5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.mre_f4.3852125460" + signature = "rusEFI master.2024.05.07.mre_f4.2681006686" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.mre_f4.3852125460" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.mre_f4.2681006686" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:03 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:34 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5660,6 +5661,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6715,6 +6717,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index aba8c6b2c4..ef7b876aa5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.mre_f7.3852125460" + signature = "rusEFI master.2024.05.07.mre_f7.2681006686" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.mre_f7.3852125460" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.mre_f7.2681006686" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:05 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:36 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5660,6 +5661,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6715,6 +6717,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index 6e108d253f..36e94e7a45 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.nucleo_f413.2881731898" + signature = "rusEFI master.2024.05.07.nucleo_f413.3516240496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.nucleo_f413.2881731898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.nucleo_f413.3516240496" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:06 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:37 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 2ff7b03357..30ab98a87c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.prometheus_405.2606198954" + signature = "rusEFI master.2024.05.07.prometheus_405.3774963680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.prometheus_405.2606198954" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.prometheus_405.3774963680" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:11 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:44 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6687,6 +6689,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index b2eeefb835..6e1e71ca5f 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.prometheus_469.2606198954" + signature = "rusEFI master.2024.05.07.prometheus_469.3774963680" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.prometheus_469.2606198954" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.prometheus_469.3774963680" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:13 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:45 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6687,6 +6689,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6e58151763..2f1575a688 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.proteus_f4.1104676632" + signature = "rusEFI master.2024.05.07.proteus_f4.999172178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.proteus_f4.1104676632" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.proteus_f4.999172178" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:51 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:23 UTC 2024 pageSize = 28156 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 28152, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5659,6 +5660,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6721,6 +6723,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 008f40a15c..80ffdec84d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.proteus_f7.1104676632" + signature = "rusEFI master.2024.05.07.proteus_f7.999172178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.proteus_f7.1104676632" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.proteus_f7.999172178" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:46 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:18 UTC 2024 pageSize = 28156 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 28152, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5659,6 +5660,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6721,6 +6723,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 6bc4880874..c4d8de462c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.proteus_h7.1104676632" + signature = "rusEFI master.2024.05.07.proteus_h7.999172178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.proteus_h7.1104676632" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.proteus_h7.999172178" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:44 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:16 UTC 2024 pageSize = 28156 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 28152, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5659,6 +5660,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6721,6 +6723,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 7b1a0792ed..5434c55c8a 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.s105.340278776" + signature = "rusEFI master.2024.05.07.s105.1847464626" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.s105.340278776" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.s105.1847464626" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:22 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:54 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6693,6 +6695,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 6efddc807d..ee897d27ee 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.small-can-board.221159192" + signature = "rusEFI master.2024.05.07.small-can-board.2004398162" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.small-can-board.221159192" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.small-can-board.2004398162" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input 6","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input 7","C4 - Analog/Digital Input 8" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:24 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:55 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 5adcc00dc7..6315f8b0a1 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.stm32f429_nucleo.2881731898" + signature = "rusEFI master.2024.05.07.stm32f429_nucleo.3516240496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.stm32f429_nucleo.2881731898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.stm32f429_nucleo.3516240496" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:14 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:46 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index f85fb7c984..3ae5e32085 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.stm32f767_nucleo.2881731898" + signature = "rusEFI master.2024.05.07.stm32f767_nucleo.3516240496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.stm32f767_nucleo.2881731898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.stm32f767_nucleo.3516240496" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:59 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:31 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index e2b7d6cc36..66f09cf506 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.stm32h743_nucleo.2881731898" + signature = "rusEFI master.2024.05.07.stm32h743_nucleo.3516240496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.stm32h743_nucleo.2881731898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.stm32h743_nucleo.3516240496" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:04 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:36 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 2132dc9339..e5b7384180 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.subaru_eg33_f7.3779963145" + signature = "rusEFI master.2024.05.07.subaru_eg33_f7.2602272323" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.subaru_eg33_f7.3779963145" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.subaru_eg33_f7.2602272323" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:19 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:51 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6694,6 +6696,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 2ae1d13c5b..5514456f98 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.t-b-g.2881731898" + signature = "rusEFI master.2024.05.07.t-b-g.3516240496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.t-b-g.2881731898" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.t-b-g.3516240496" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:06 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:39 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 709894bdd1..44cbd7e525 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.tdg-pdm8.2448294322" + signature = "rusEFI master.2024.05.07.tdg-pdm8.3954716408" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.tdg-pdm8.2448294322" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.tdg-pdm8.3954716408" ; 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 @@ -100,7 +100,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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:05:59 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:41:30 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5658,6 +5659,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6692,6 +6694,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 56f1320666..09fa0ef2c9 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.05.07.uaefi.3518611457" + signature = "rusEFI master.2024.05.07.uaefi.2884628299" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.05.07.uaefi.3518611457" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.05.07.uaefi.2884628299" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","C15 Fuel Pressure / AUX3","C14 TPS2","INVALID","D9 MAP","On-board MAP","D16 CLT Coolant","D15 IAT","C4 PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:06:39 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:11 UTC 2024 pageSize = 22656 page = 1 @@ -2512,7 +2512,7 @@ tcu_shiftTime = scalar, F32, 22652, "ms", 1, 0, 0, 3000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1744 + ochBlockSize = 1748 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3243,167 +3243,168 @@ triggerToothAngleError = scalar, F32, 1304, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1308, "", 1, 0 mapCamPrevToothAngle = scalar, F32, 1312, "deg", 1, 0 isDecodingMapCam = bits, U32, 1316, [0:0] -; total TS size = 1320 -crankSynchronizationCounter0 = scalar, U32, 1320, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1328, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1332, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1336, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1352, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1356, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1357, "", 1, 0 -; total TS size = 1360 -crankSynchronizationCounter1 = scalar, U32, 1360, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1368, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1372, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1376, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1392, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1396, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1397, "", 1, 0 -; total TS size = 1400 -crankSynchronizationCounter2 = scalar, U32, 1400, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1408, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1412, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1416, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1432, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1436, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1437, "", 1, 0 -; total TS size = 1440 -crankSynchronizationCounter3 = scalar, U32, 1440, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1448, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1452, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1456, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1472, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1476, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1477, "", 1, 0 -; total TS size = 1480 -crankSynchronizationCounter4 = scalar, U32, 1480, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1488, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1492, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1496, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1512, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1516, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1517, "", 1, 0 -; total TS size = 1520 -camResyncCounter = scalar, U08, 1520, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1524, [0:0] -; total TS size = 1528 -wallFuelCorrection = scalar, F32, 1528, "", 1, 0 -wallFuel = scalar, F32, 1532, "", 1, 0 -; total TS size = 1536 -idleState = bits, S32, 1536, [0:2], "not important" -currentIdlePosition = scalar, F32, 1540 -baseIdlePosition = scalar, F32, 1544 -idleClosedLoop = scalar, F32, 1548 -iacByTpsTaper = scalar, F32, 1552 -throttlePedalUpState = scalar, S32, 1556, "", 1, 0 -mightResetPid = bits, U32, 1560, [0:0] -shouldResetPid = bits, U32, 1560, [1:1] -wasResetPid = bits, U32, 1560, [2:2] -mustResetPid = bits, U32, 1560, [3:3] -isCranking = bits, U32, 1560, [4:4] -isIacTableForCoasting = bits, U32, 1560, [5:5] -notIdling = bits, U32, 1560, [6:6] -needReset = bits, U32, 1560, [7:7] -isInDeadZone = bits, U32, 1560, [8:8] -isBlipping = bits, U32, 1560, [9:9] -useClosedLoop = bits, U32, 1560, [10:10] -badTps = bits, U32, 1560, [11:11] -looksLikeRunning = bits, U32, 1560, [12:12] -looksLikeCoasting = bits, U32, 1560, [13:13] -looksLikeCrankToIdle = bits, U32, 1560, [14:14] -isIdleCoasting = bits, U32, 1560, [15:15] -isIdleClosedLoop = bits, U32, 1560, [16:16] -idleTarget = scalar, S32, 1564, "", 1, 0 -targetRpmByClt = scalar, S32, 1568, "", 1, 0 -targetRpmAc = scalar, S32, 1572, "", 1, 0 -iacByRpmTaper = scalar, F32, 1576 -luaAdd = scalar, F32, 1580 -; total TS size = 1584 -idlePosition0 = scalar, F32, 1584, "per", 1,0 -trim0 = scalar, F32, 1588, "", 1, 0 -luaAdjustment0 = scalar, F32, 1592, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1596, "per", 1,0 -etbFeedForward0 = scalar, F32, 1600 -etbIntegralError0 = scalar, F32, 1604, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1608, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1612, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1616, [0:0] -jamDetected0 = bits, U32, 1616, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1620, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1624, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1628, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1630, "count", 1,0 -etbErrorCode0 = scalar, S08, 1632, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1633, "", 1, 0 -jamTimer0 = scalar, U16, 1634, "sec", 0.01, 0 -; total TS size = 1636 -idlePosition1 = scalar, F32, 1636, "per", 1,0 -trim1 = scalar, F32, 1640, "", 1, 0 -luaAdjustment1 = scalar, F32, 1644, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1648, "per", 1,0 -etbFeedForward1 = scalar, F32, 1652 -etbIntegralError1 = scalar, F32, 1656, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1660, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1664, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1668, [0:0] -jamDetected1 = bits, U32, 1668, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1672, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1676, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0 -etbErrorCode1 = scalar, S08, 1684, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1685, "", 1, 0 -jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0 -; total TS size = 1688 -faultCode0 = scalar, U08, 1688, "", 1, 0 -heaterDuty0 = scalar, U08, 1689, "%", 1, 0 -pumpDuty0 = scalar, U08, 1690, "%", 1, 0 -tempC0 = scalar, U16, 1692, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1694, "V", 0.001, 0 -esr0 = scalar, U16, 1696, "ohm", 1, 0 -; total TS size = 1700 -faultCode1 = scalar, U08, 1700, "", 1, 0 -heaterDuty1 = scalar, U08, 1701, "%", 1, 0 -pumpDuty1 = scalar, U08, 1702, "%", 1, 0 -tempC1 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1706, "V", 0.001, 0 -esr1 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -dcOutput0 = scalar, F32, 1712, "per", 1,0 -isEnabled0_int = scalar, U08, 1716, "per", 1,0 -isEnabled0 = bits, U32, 1720, [0:0] -; total TS size = 1724 -value0 = scalar, U16, 1724, "value", 1,0 -value1 = scalar, U16, 1726, "value", 1,0 -errorRate = scalar, F32, 1728, "ratio", 1,0 -; total TS size = 1732 -vvtTarget = scalar, U16, 1732, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1734, "%", 0.5, 0 +triggerElapsedUs = scalar, U32, 1320, "", 1, 0 +; total TS size = 1324 +crankSynchronizationCounter0 = scalar, U32, 1324, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1328, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1332, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1336, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1340, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1356, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1360, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1361, "", 1, 0 +; total TS size = 1364 +crankSynchronizationCounter1 = scalar, U32, 1364, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1368, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1372, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1376, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1380, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1396, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1400, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1401, "", 1, 0 +; total TS size = 1404 +crankSynchronizationCounter2 = scalar, U32, 1404, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1408, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1412, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1416, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1420, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1436, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1440, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1441, "", 1, 0 +; total TS size = 1444 +crankSynchronizationCounter3 = scalar, U32, 1444, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1448, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1456, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1460, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1480, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1481, "", 1, 0 +; total TS size = 1484 +crankSynchronizationCounter4 = scalar, U32, 1484, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1488, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1492, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1496, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1500, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1516, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1520, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1521, "", 1, 0 +; total TS size = 1524 +camResyncCounter = scalar, U08, 1524, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1528, [0:0] +; total TS size = 1532 +wallFuelCorrection = scalar, F32, 1532, "", 1, 0 +wallFuel = scalar, F32, 1536, "", 1, 0 +; total TS size = 1540 +idleState = bits, S32, 1540, [0:2], "not important" +currentIdlePosition = scalar, F32, 1544 +baseIdlePosition = scalar, F32, 1548 +idleClosedLoop = scalar, F32, 1552 +iacByTpsTaper = scalar, F32, 1556 +throttlePedalUpState = scalar, S32, 1560, "", 1, 0 +mightResetPid = bits, U32, 1564, [0:0] +shouldResetPid = bits, U32, 1564, [1:1] +wasResetPid = bits, U32, 1564, [2:2] +mustResetPid = bits, U32, 1564, [3:3] +isCranking = bits, U32, 1564, [4:4] +isIacTableForCoasting = bits, U32, 1564, [5:5] +notIdling = bits, U32, 1564, [6:6] +needReset = bits, U32, 1564, [7:7] +isInDeadZone = bits, U32, 1564, [8:8] +isBlipping = bits, U32, 1564, [9:9] +useClosedLoop = bits, U32, 1564, [10:10] +badTps = bits, U32, 1564, [11:11] +looksLikeRunning = bits, U32, 1564, [12:12] +looksLikeCoasting = bits, U32, 1564, [13:13] +looksLikeCrankToIdle = bits, U32, 1564, [14:14] +isIdleCoasting = bits, U32, 1564, [15:15] +isIdleClosedLoop = bits, U32, 1564, [16:16] +idleTarget = scalar, S32, 1568, "", 1, 0 +targetRpmByClt = scalar, S32, 1572, "", 1, 0 +targetRpmAc = scalar, S32, 1576, "", 1, 0 +iacByRpmTaper = scalar, F32, 1580 +luaAdd = scalar, F32, 1584 +; total TS size = 1588 +idlePosition0 = scalar, F32, 1588, "per", 1,0 +trim0 = scalar, F32, 1592, "", 1, 0 +luaAdjustment0 = scalar, F32, 1596, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 +etbFeedForward0 = scalar, F32, 1604 +etbIntegralError0 = scalar, F32, 1608, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1612, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1616, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1620, [0:0] +jamDetected0 = bits, U32, 1620, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1624, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1628, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0 +etbErrorCode0 = scalar, S08, 1636, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 +jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 +; total TS size = 1640 +idlePosition1 = scalar, F32, 1640, "per", 1,0 +trim1 = scalar, F32, 1644, "", 1, 0 +luaAdjustment1 = scalar, F32, 1648, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 +etbFeedForward1 = scalar, F32, 1656 +etbIntegralError1 = scalar, F32, 1660, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1664, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1668, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1672, [0:0] +jamDetected1 = bits, U32, 1672, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1676, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1680, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1684, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1686, "count", 1,0 +etbErrorCode1 = scalar, S08, 1688, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1689, "", 1, 0 +jamTimer1 = scalar, U16, 1690, "sec", 0.01, 0 +; total TS size = 1692 +faultCode0 = scalar, U08, 1692, "", 1, 0 +heaterDuty0 = scalar, U08, 1693, "%", 1, 0 +pumpDuty0 = scalar, U08, 1694, "%", 1, 0 +tempC0 = scalar, U16, 1696, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0 +esr0 = scalar, U16, 1700, "ohm", 1, 0 +; total TS size = 1704 +faultCode1 = scalar, U08, 1704, "", 1, 0 +heaterDuty1 = scalar, U08, 1705, "%", 1, 0 +pumpDuty1 = scalar, U08, 1706, "%", 1, 0 +tempC1 = scalar, U16, 1708, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0 +esr1 = scalar, U16, 1712, "ohm", 1, 0 +; total TS size = 1716 +dcOutput0 = scalar, F32, 1716, "per", 1,0 +isEnabled0_int = scalar, U08, 1720, "per", 1,0 +isEnabled0 = bits, U32, 1724, [0:0] +; total TS size = 1728 +value0 = scalar, U16, 1728, "value", 1,0 +value1 = scalar, U16, 1730, "value", 1,0 +errorRate = scalar, F32, 1732, "ratio", 1,0 ; total TS size = 1736 -lambdaCurrentlyGood = bits, U32, 1736, [0:0] -lambdaMonitorCut = bits, U32, 1736, [1:1] -lambdaTimeSinceGood = scalar, U16, 1740, "sec", 0.01, 0 -; total TS size = 1744 +vvtTarget = scalar, U16, 1736, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1738, "%", 0.5, 0 +; total TS size = 1740 +lambdaCurrentlyGood = bits, U32, 1740, [0:0] +lambdaMonitorCut = bits, U32, 1740, [1:1] +lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0 +; total TS size = 1748 time = { timeNow } @@ -5659,6 +5660,7 @@ entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" +entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" entry = crankSynchronizationCounter0, "sync: Crank sync counter0", int, "%d" entry = vvtSyncGapRatio0, "vvtSyncGapRatio0", float, "%.3f" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" @@ -6712,6 +6714,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount graphLine = mapCamPrevToothAngle + graphLine = triggerElapsedUs dialog = trigger_state0Dialog, "trigger_state0" 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 72760e0fe9..c150c3f59e 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-all.jar based on (unknown script) controllers/actuators/dc_motors.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/dc_motors.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -174,10 +174,10 @@ public class DcMotors { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1712); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1712); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1712); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1712); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1716); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1716); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1716); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1716); 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 5bb6225f56..3c4edeb1c6 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-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -174,23 +174,23 @@ public class ElectronicThrottle { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1584); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1584); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1584); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1584); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1584); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1584); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1584); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1584); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1584); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1584); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1584); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1584); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1584); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1584); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1584); - public static final Field TCETBDROP = Field.create("TCETBDROP", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1584); - public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1584); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1588); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1588); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1588); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1588); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1588); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1588); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1588); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1588); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1588); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1588); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1588); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1588); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1588); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1588); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1588); + public static final Field TCETBDROP = Field.create("TCETBDROP", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1588); + public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1588); 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 b7d42a79fc..a5786b047d 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-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 16:07:25 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue May 07 17:42:57 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1193,7 +1193,7 @@ 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 = 261244507; + public static final int SIGNATURE_HASH = 1975806225; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1449,11 +1449,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.2024.05.07.f407-discovery.261244507"; + public static final String TS_SIGNATURE = "rusEFI master.2024.05.07.f407-discovery.1975806225"; 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 = 1744; + public static final int TS_TOTAL_OUTPUT_SIZE = 1748; 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 e3e1f93cd4..788d193e3c 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-all.jar based on (unknown script) controllers/actuators/idle_state.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/idle_state.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -174,34 +174,34 @@ public class IdleState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1536); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1536); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1536); - public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1536); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1536); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1536); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1536); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1536); - public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1536); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1536); - public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1536); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1536); - public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1536); - public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1536); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1536); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1536); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1536); - public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1536); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1536); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1536); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1536); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1536); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1536); - public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1536); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1536); - public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1536); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1536); - public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1536); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1540); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1540); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1540); + public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1540); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1540); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1540); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1540); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1540); + public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1540); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1540); + public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1540); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1540); + public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1540); + public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1540); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1540); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1540); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1540); + public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1540); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1540); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1540); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1540); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1540); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1540); + public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1540); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1540); + public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1540); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1540); + public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1540); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java index a5c4b7bdc5..91e41dd4fe 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-all.jar based on (unknown script) controllers/math/lambda_monitor.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/math/lambda_monitor.txt Tue May 07 17:41:25 UTC 2024 // 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(1736); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1736); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1736); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1736); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1740); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1740); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1740); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1740); 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 8d26f7d3e2..ed34aa619d 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-all.jar based on (unknown script) controllers/sensors/sent_state.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/sensors/sent_state.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -174,9 +174,9 @@ public class SentState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1724); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1724); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1724); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1728); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1728); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1728); public static final Field[] VALUES = { VALUE0, VALUE1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index 015f2d0994..d0a46c827e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_central.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -25,6 +25,7 @@ public class TriggerCentral { public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1260); public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1260); public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1260); + public static final Field TRIGGERELAPSEDUS = Field.create("TRIGGERELAPSEDUS", 60, FieldType.INT).setScale(1.0).setBaseOffset(1260); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, @@ -44,5 +45,6 @@ public class TriggerCentral { ALIGNMENTFILL_AT_49, MAPCAMPREVTOOTHANGLE, ISDECODINGMAPCAM, + TRIGGERELAPSEDUS, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index fc929e0aff..d423058db7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -174,18 +174,18 @@ public class TriggerState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1320); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1320); - public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1320); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1320); - public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1320); - public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1320); - public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1320); - public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1320); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1320); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1320); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1320); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1320); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1324); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1324); + public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1324); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1324); + public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1324); + public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1324); + public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1324); + public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1324); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1324); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1324); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1324); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1324); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index c7161ac12e..e09edde6c3 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -174,9 +174,9 @@ public class TriggerStatePrimary { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1520); - public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1520); - public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1520); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1524); + public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1524); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1524); public static final Field[] VALUES = { CAMRESYNCCOUNTER, ALIGNMENTFILL_AT_1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java index 029bb9ffc8..1f5c233f70 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-all.jar based on (unknown script) controllers/actuators/vvt.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/vvt.txt Tue May 07 17:41:25 UTC 2024 // 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(1732); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1732); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1732); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1736); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1736); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1736); public static final Field[] VALUES = { VVTTARGET, VVTOUTPUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index d6f377bb42..545efb935f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,13 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Tue May 07 17:41:25 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1528); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1528); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1532); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1532); public static final Field[] VALUES = { WALLFUELCORRECTION, WALLFUEL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index c0906c4925..76539246a8 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-all.jar based on (unknown script) controllers/sensors//wideband_state.txt Sun Apr 28 13:42:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/sensors//wideband_state.txt Tue May 07 17:41:25 UTC 2024 // 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(1688); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1688); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1688); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1688); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1688); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1688); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1688); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1688); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1692); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1692); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1692); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1692); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1692); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1692); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1692); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1692); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,