diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 5f1789bc2a..d46a1a274b 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -648,7 +648,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 415d61fc17..576fddaf65 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -351,16 +351,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index b2070744af..ced376a5d3 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -61,15 +61,15 @@ LDS_lambda_monitor, #define FUEL_PUMP_CONTROL_BASE_ADDRESS 1212 #define MAIN_RELAY_BASE_ADDRESS 1216 #define ENGINE_STATE_BASE_ADDRESS 1220 -#define TPS_ACCEL_STATE_BASE_ADDRESS 1320 -#define TRIGGER_CENTRAL_BASE_ADDRESS 1368 -#define TRIGGER_STATE_BASE_ADDRESS 1416 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1596 -#define WALL_FUEL_STATE_BASE_ADDRESS 1604 -#define IDLE_STATE_BASE_ADDRESS 1612 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1656 -#define WIDEBAND_STATE_BASE_ADDRESS 1752 -#define DC_MOTORS_BASE_ADDRESS 1776 -#define SENT_STATE_BASE_ADDRESS 1788 -#define VVT_BASE_ADDRESS 1796 -#define LAMBDA_MONITOR_BASE_ADDRESS 1800 +#define TPS_ACCEL_STATE_BASE_ADDRESS 1316 +#define TRIGGER_CENTRAL_BASE_ADDRESS 1364 +#define TRIGGER_STATE_BASE_ADDRESS 1412 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1592 +#define WALL_FUEL_STATE_BASE_ADDRESS 1600 +#define IDLE_STATE_BASE_ADDRESS 1608 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1652 +#define WIDEBAND_STATE_BASE_ADDRESS 1748 +#define DC_MOTORS_BASE_ADDRESS 1772 +#define SENT_STATE_BASE_ADDRESS 1784 +#define VVT_BASE_ADDRESS 1792 +#define LAMBDA_MONITOR_BASE_ADDRESS 1796 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 7f48c9e25e..17ab6ad602 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -721,200 +721,199 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 2c5529584f..f004469735 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -498,169 +498,167 @@ startStopStateToggleCounter("startStopStateToggleCounter", SensorCategory.SENSOR luaSoftSparkSkip("luaSoftSparkSkip", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1280, 1.0, -1.0, -1.0, ""), luaHardSparkSkip("luaHardSparkSkip", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1284, 1.0, -1.0, -1.0, ""), tractionControlSparkSkip("tractionControlSparkSkip", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1288, 1.0, -1.0, -1.0, ""), -desiredRpmLimit("User-defined RPM hard limit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1292, 1.0, 0.0, 30000.0, "rpm"), -alignmentFill_at_74("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1294, 1.0, -20.0, 100.0, "units"), -fuelInjectionCounter("Fuel: Injection counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, -1.0, -1.0, ""), -globalSparkCounter("Ign: Spark counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, -1.0, -1.0, ""), -fuelingLoad("Fuel: Load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, -1.0, -1.0, ""), -ignitionLoad("Ignition: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, -1.0, -1.0, ""), -veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1312, 0.01, 0.0, 0.0, "%"), -overDwellCounter("overDwellCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1314, 1.0, -1.0, -1.0, ""), -overDwellNotScheduledCounter("overDwellNotScheduledCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1315, 1.0, -1.0, -1.0, ""), -sparkOutOfOrderCounter("sparkOutOfOrderCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1316, 1.0, -1.0, -1.0, ""), -alignmentFill_at_97("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1317, 1.0, -20.0, 100.0, "units"), -tpsFrom("Fuel: TPS AE from", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), -tpsTo("Fuel: TPS AE to", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), -deltaTps("Fuel: TPS AE change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -1.0, -1.0, ""), -extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), -valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -1.0, -1.0, ""), -fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -1.0, -1.0, ""), -accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -1.0, -1.0, ""), -maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -1.0, -1.0, ""), -maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, -1.0, -1.0, ""), -maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1360, 1.0, -1.0, -1.0, ""), -cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1364, 1.0, -1.0, -1.0, ""), -hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1368, 1.0, -1.0, -1.0, ""), -hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1370, 1.0, -1.0, -1.0, ""), -hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1372, 1.0, -1.0, -1.0, ""), -hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1374, 1.0, -1.0, -1.0, ""), -vvtCamCounter("Sync: total cams front counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1376, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1378, 1.0, -20.0, 100.0, "units"), -mapVvt_MAP_AT_SPECIAL_POINT("InstantMAP at readout angle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1380, 1.0, -300.0, 300.0, "kPa"), -mapVvt_MAP_AT_DIFF("InstantMAP delta @ readout angles", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1384, 1.0, -300.0, 300.0, "kPa"), -mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1388, 1.0, -10.0, 100.0, "distance"), -mapVvt_sync_counter("Instant MAP sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1389, 1.0, 0.0, 10000.0, "counter"), -alignmentFill_at_22("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1390, 1.0, -20.0, 100.0, "units"), -currentEngineDecodedPhase("Sync: Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1392, 1.0, 0.0, 0.0, "deg"), -triggerToothAngleError("Sync: trigger angle error", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1396, 1.0, -30.0, 30.0, "deg"), -triggerIgnoredToothCount("triggerIgnoredToothCount", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1400, 1.0, -1.0, -1.0, ""), -alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1401, 1.0, -20.0, 100.0, "units"), -mapCamPrevToothAngle("Sync: MAP: prev angle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1404, 1.0, -3000.0, 3000.0, "deg"), -triggerElapsedUs("triggerElapsedUs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1412, 1.0, -1.0, -1.0, ""), -synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, -1.0, -1.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1444, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1448, 1.0, -1.0, -1.0, ""), -alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1449, 1.0, -20.0, 100.0, "units"), -synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, -1.0, -1.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1444, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1448, 1.0, -1.0, -1.0, ""), -alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1449, 1.0, -20.0, 100.0, "units"), -synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, -1.0, -1.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1444, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1448, 1.0, -1.0, -1.0, ""), -alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1449, 1.0, -20.0, 100.0, "units"), -synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, -1.0, -1.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1444, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1448, 1.0, -1.0, -1.0, ""), -alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1449, 1.0, -20.0, 100.0, "units"), -synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, -1.0, -1.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), -vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1444, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1448, 1.0, -1.0, -1.0, ""), -alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1449, 1.0, -20.0, 100.0, "units"), -camResyncCounter("sync: Phase Re-Sync Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1596, 1.0, -1.0, -1.0, ""), -alignmentFill_at_1("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1597, 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, 1604, 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, 1608, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -1.0, -1.0, ""), -currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1616, 1.0, 0.0, 0.0, "%"), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1620, 1.0, -1.0, -1.0, ""), -idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1624, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1628, 1.0, -1.0, -1.0, ""), -idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1636, 1.0, -1.0, -1.0, ""), -targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1640, 1.0, -1.0, -1.0, ""), -targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1644, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1648, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1652, 1.0, -1.0, -1.0, ""), -targetWithIdlePosition("ETB: target with idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1656, 1.0, 0.0, 10.0, "%"), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1660, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1664, 1.0, 0.0, 3.0, "%"), -m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1668, 1.0, 0.0, 3.0, "%"), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1672, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1676, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1680, 1.0, -10000.0, 10000.0, "%"), -m_adjustedTarget("Adjusted target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1684, 0.01, -100.0, 100.0, "%"), -alignmentFill_at_30("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1686, 1.0, -20.0, 100.0, "units"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1692, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1694, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1696, 1.0, -1.0, -1.0, ""), -etbErrorCodeBlinker("etbErrorCodeBlinker", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1697, 1.0, -1.0, -1.0, ""), -tcEtbDrop("ETB traction control", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1698, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_43("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1699, 1.0, -20.0, 100.0, "units"), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1700, 0.01, 0.0, 100.0, "sec"), -adjustedEtbTarget("ETB with adjustments", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1702, 1.0, 0.0, 100.0, "%"), -state("state", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1703, 1.0, -1.0, -1.0, ""), -targetWithIdlePosition("ETB: target with idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1656, 1.0, 0.0, 10.0, "%"), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1660, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1664, 1.0, 0.0, 3.0, "%"), -m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1668, 1.0, 0.0, 3.0, "%"), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1672, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1676, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1680, 1.0, -10000.0, 10000.0, "%"), -m_adjustedTarget("Adjusted target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1684, 0.01, -100.0, 100.0, "%"), -alignmentFill_at_30("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1686, 1.0, -20.0, 100.0, "units"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1692, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1694, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1696, 1.0, -1.0, -1.0, ""), -etbErrorCodeBlinker("etbErrorCodeBlinker", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1697, 1.0, -1.0, -1.0, ""), -tcEtbDrop("ETB traction control", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1698, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_43("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1699, 1.0, -20.0, 100.0, "units"), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1700, 0.01, 0.0, 100.0, "sec"), -adjustedEtbTarget("ETB with adjustments", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1702, 1.0, 0.0, 100.0, "%"), -state("state", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1703, 1.0, -1.0, -1.0, ""), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1752, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1753, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1754, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1755, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1756, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1758, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1760, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1762, 1.0, -20.0, 100.0, "units"), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1752, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1753, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1754, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1755, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1756, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1758, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1760, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1762, 1.0, -20.0, 100.0, "units"), -dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1776, 1.0, 0.0, 10.0, "%"), -isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1780, 1.0, 0.0, 10.0, "%"), -alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1781, 1.0, -20.0, 100.0, "units"), -value0("SENT ch0 value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1788, 1.0, 0.0, 4095.0, "RAW"), -value1("SENT ch0 value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1790, 1.0, 0.0, 4095.0, "RAW"), -errorRate("SENT ch0 error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1792, 1.0, 0.0, 100.0, "% (don't belive me)"), -vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1796, 0.1, -90.0, 90.0, "deg"), -vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1798, 0.5, 100.0, 1.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1799, 1.0, -20.0, 100.0, "units"), -lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1804, 0.01, 0.0, 1.0, "sec"), -alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1806, 1.0, -20.0, 100.0, "units"), +fuelInjectionCounter("Fuel: Injection counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1292, 1.0, -1.0, -1.0, ""), +globalSparkCounter("Ign: Spark counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, -1.0, -1.0, ""), +fuelingLoad("Fuel: Load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, -1.0, -1.0, ""), +ignitionLoad("Ignition: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, -1.0, -1.0, ""), +veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1308, 0.01, 0.0, 0.0, "%"), +overDwellCounter("overDwellCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1310, 1.0, -1.0, -1.0, ""), +overDwellNotScheduledCounter("overDwellNotScheduledCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1311, 1.0, -1.0, -1.0, ""), +sparkOutOfOrderCounter("sparkOutOfOrderCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1312, 1.0, -1.0, -1.0, ""), +alignmentFill_at_93("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1313, 1.0, -20.0, 100.0, "units"), +tpsFrom("Fuel: TPS AE from", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, -1.0, -1.0, ""), +tpsTo("Fuel: TPS AE to", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), +deltaTps("Fuel: TPS AE change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1360, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1364, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1366, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1368, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1370, 1.0, -1.0, -1.0, ""), +vvtCamCounter("Sync: total cams front counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1372, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1374, 1.0, -20.0, 100.0, "units"), +mapVvt_MAP_AT_SPECIAL_POINT("InstantMAP at readout angle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1376, 1.0, -300.0, 300.0, "kPa"), +mapVvt_MAP_AT_DIFF("InstantMAP delta @ readout angles", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1380, 1.0, -300.0, 300.0, "kPa"), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1384, 1.0, -10.0, 100.0, "distance"), +mapVvt_sync_counter("Instant MAP sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1385, 1.0, 0.0, 10000.0, "counter"), +alignmentFill_at_22("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1386, 1.0, -20.0, 100.0, "units"), +currentEngineDecodedPhase("Sync: Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1388, 1.0, 0.0, 0.0, "deg"), +triggerToothAngleError("Sync: trigger angle error", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1392, 1.0, -30.0, 30.0, "deg"), +triggerIgnoredToothCount("triggerIgnoredToothCount", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1396, 1.0, -1.0, -1.0, ""), +alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1397, 1.0, -20.0, 100.0, "units"), +mapCamPrevToothAngle("Sync: MAP: prev angle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1400, 1.0, -3000.0, 3000.0, "deg"), +triggerElapsedUs("triggerElapsedUs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1408, 1.0, -1.0, -1.0, ""), +synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1412, 1.0, -1.0, -1.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1444, 1.0, -1.0, -1.0, ""), +alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1445, 1.0, -20.0, 100.0, "units"), +synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1412, 1.0, -1.0, -1.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1444, 1.0, -1.0, -1.0, ""), +alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1445, 1.0, -20.0, 100.0, "units"), +synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1412, 1.0, -1.0, -1.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1444, 1.0, -1.0, -1.0, ""), +alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1445, 1.0, -20.0, 100.0, "units"), +synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1412, 1.0, -1.0, -1.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1444, 1.0, -1.0, -1.0, ""), +alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1445, 1.0, -20.0, 100.0, "units"), +synchronizationCounter("sync: trigger wheel sync counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1412, 1.0, -1.0, -1.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1416, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("sync: Primary Cam Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1420, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition1("sync: Cam Tooth Position 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition2("sync: Cam Tooth Position 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition3("sync: Cam Tooth Position 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1432, 1.0, -10000.0, 10000.0, ""), +vvtToothPosition4("sync: Cam Tooth Position 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1436, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Sync: Trigger Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1440, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1444, 1.0, -1.0, -1.0, ""), +alignmentFill_at_33("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1445, 1.0, -20.0, 100.0, "units"), +camResyncCounter("sync: Phase Re-Sync Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1592, 1.0, -1.0, -1.0, ""), +alignmentFill_at_1("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1593, 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, 1600, 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, 1604, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1608, 1.0, -1.0, -1.0, ""), +currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, 0.0, 0.0, "%"), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1616, 1.0, -1.0, -1.0, ""), +idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1620, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1624, 1.0, -1.0, -1.0, ""), +idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1632, 1.0, -1.0, -1.0, ""), +targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1636, 1.0, -1.0, -1.0, ""), +targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1640, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1644, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1648, 1.0, -1.0, -1.0, ""), +targetWithIdlePosition("ETB: target with idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1652, 1.0, 0.0, 10.0, "%"), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1656, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1660, 1.0, 0.0, 3.0, "%"), +m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1664, 1.0, 0.0, 3.0, "%"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1668, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1672, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1676, 1.0, -10000.0, 10000.0, "%"), +m_adjustedTarget("Adjusted target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1680, 0.01, -100.0, 100.0, "%"), +alignmentFill_at_30("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1682, 1.0, -20.0, 100.0, "units"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1688, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1690, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1692, 1.0, -1.0, -1.0, ""), +etbErrorCodeBlinker("etbErrorCodeBlinker", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1693, 1.0, -1.0, -1.0, ""), +tcEtbDrop("ETB traction control", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1694, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_43("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1695, 1.0, -20.0, 100.0, "units"), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1696, 0.01, 0.0, 100.0, "sec"), +adjustedEtbTarget("ETB with adjustments", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1698, 1.0, 0.0, 100.0, "%"), +state("state", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1699, 1.0, -1.0, -1.0, ""), +targetWithIdlePosition("ETB: target with idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1652, 1.0, 0.0, 10.0, "%"), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1656, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1660, 1.0, 0.0, 3.0, "%"), +m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1664, 1.0, 0.0, 3.0, "%"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1668, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1672, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1676, 1.0, -10000.0, 10000.0, "%"), +m_adjustedTarget("Adjusted target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1680, 0.01, -100.0, 100.0, "%"), +alignmentFill_at_30("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1682, 1.0, -20.0, 100.0, "units"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1688, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1690, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1692, 1.0, -1.0, -1.0, ""), +etbErrorCodeBlinker("etbErrorCodeBlinker", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1693, 1.0, -1.0, -1.0, ""), +tcEtbDrop("ETB traction control", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1694, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_43("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1695, 1.0, -20.0, 100.0, "units"), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1696, 0.01, 0.0, 100.0, "sec"), +adjustedEtbTarget("ETB with adjustments", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1698, 1.0, 0.0, 100.0, "%"), +state("state", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1699, 1.0, -1.0, -1.0, ""), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1748, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1749, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1750, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1751, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1752, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1754, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1756, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1758, 1.0, -20.0, 100.0, "units"), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1748, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1749, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1750, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1751, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1752, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1754, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1756, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1758, 1.0, -20.0, 100.0, "units"), +dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1772, 1.0, 0.0, 10.0, "%"), +isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1776, 1.0, 0.0, 10.0, "%"), +alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1777, 1.0, -20.0, 100.0, "units"), +value0("SENT ch0 value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1784, 1.0, 0.0, 4095.0, "RAW"), +value1("SENT ch0 value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1786, 1.0, 0.0, 4095.0, "RAW"), +errorRate("SENT ch0 error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1788, 1.0, 0.0, 100.0, "% (don't belive me)"), +vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1792, 0.1, -90.0, 90.0, "deg"), +vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1794, 0.5, 100.0, 1.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1795, 1.0, -20.0, 100.0, "units"), +lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1800, 0.01, 0.0, 1.0, "sec"), +alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1802, 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 c64679d3e8..c084bc6e65 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 1808 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1804 \ 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 4c3f8b5795..3488e6eea3 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -497,7 +497,6 @@ static const LogField fields[] = { {engine->engineState.luaSoftSparkSkip, "luaSoftSparkSkip", "", 0}, {engine->engineState.luaHardSparkSkip, "luaHardSparkSkip", "", 0}, {engine->engineState.tractionControlSparkSkip, "tractionControlSparkSkip", "", 0}, - {engine->engineState.desiredRpmLimit, "User-defined RPM hard limit", "rpm", 0}, {engine->engineState.fuelInjectionCounter, "Fuel: Injection counter", "", 0}, {engine->engineState.globalSparkCounter, "Ign: Spark counter", "", 0}, {engine->engineState.fuelingLoad, "Fuel: Load", "", 0}, diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 2eca2f0297..987703513d 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1333,7 +1333,7 @@ #define show_2chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1752384059 +#define SIGNATURE_HASH 2600038041 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-2chan.1752384059" +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-2chan.2600038041" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 bb6db5b85d..070da54278 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1334,7 +1334,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 569095602 +#define SIGNATURE_HASH 3546388752 #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" @@ -1802,14 +1802,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-4chan.569095602" +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-4chan.3546388752" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 ab832dad0f..f35c7e7744 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1334,7 +1334,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 569095602 +#define SIGNATURE_HASH 3546388752 #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" @@ -1802,14 +1802,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-4chan_f7.569095602" +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-4chan_f7.3546388752" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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-4k-gdi.h b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h index b2bac2a15b..b45850eddd 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1330472868 +#define SIGNATURE_HASH 3183954694 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-4k-gdi.1330472868" +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-4k-gdi.3183954694" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index c70517be62..7ff2ed304b 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1333,7 +1333,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1586820639 +#define SIGNATURE_HASH 2887703229 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-8chan-revA.1586820639" +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-8chan-revA.2887703229" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 19729758fd..1b817caa6a 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1331,7 +1331,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2614108839 +#define SIGNATURE_HASH 1767509509 #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" @@ -1799,14 +1799,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-8chan.2614108839" +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-8chan.1767509509" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 429027bc4b..74305cbfdb 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1331,7 +1331,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2614108839 +#define SIGNATURE_HASH 1767509509 #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" @@ -1799,14 +1799,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-8chan_f7.2614108839" +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-8chan_f7.1767509509" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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-silver.h b/firmware/controllers/generated/rusefi_generated_alphax-silver.h index 9980da168d..7e15dbf233 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-silver.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-silver.h @@ -1332,7 +1332,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1761253893 +#define SIGNATURE_HASH 2591078055 #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" @@ -1800,14 +1800,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-silver.1761253893" +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-silver.2591078055" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 66da136f2e..a1fe57ffd5 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2815825999 +#define SIGNATURE_HASH 1432106221 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.at_start_f435.2815825999" +#define TS_SIGNATURE "rusEFI master.2024.12.27.at_start_f435.1432106221" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 ab16fa65fc..ff21b01354 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3822177281 +#define SIGNATURE_HASH 291233955 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.atlas.3822177281" +#define TS_SIGNATURE "rusEFI master.2024.12.27.atlas.291233955" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 7d9129ec02..963b33cf4c 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1336,7 +1336,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 1198445042 +#define SIGNATURE_HASH 3051683152 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.f407-discovery.1198445042" +#define TS_SIGNATURE "rusEFI master.2024.12.27.f407-discovery.3051683152" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 44e571a637..1043866cef 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2815825999 +#define SIGNATURE_HASH 1432106221 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.f429-discovery.2815825999" +#define TS_SIGNATURE "rusEFI master.2024.12.27.f429-discovery.1432106221" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 687fc934de..d37c1e99b4 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2499878620 +#define SIGNATURE_HASH 1737175678 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.f469-discovery.2499878620" +#define TS_SIGNATURE "rusEFI master.2024.12.27.f469-discovery.1737175678" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 b78c4710bc..daa48d8899 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1337,7 +1337,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 4048907348 +#define SIGNATURE_HASH 64962806 #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" @@ -1805,14 +1805,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.frankenso_na6.4048907348" +#define TS_SIGNATURE "rusEFI master.2024.12.27.frankenso_na6.64962806" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 56db3d3ea0..8a888d958d 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2815825999 +#define SIGNATURE_HASH 1432106221 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.haba208.2815825999" +#define TS_SIGNATURE "rusEFI master.2024.12.27.haba208.1432106221" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 7dd2ee1724..42673b4197 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1336,7 +1336,7 @@ #define show_8chan_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 786333899 +#define SIGNATURE_HASH 3696536681 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen-112-17.786333899" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen-112-17.3696536681" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 12689589e6..6e9baf2d69 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1806663671 +#define SIGNATURE_HASH 2569360213 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen-gm-e67.1806663671" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen-gm-e67.2569360213" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 5a5d192972..74983fa74c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4092553785 +#define SIGNATURE_HASH 23414427 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen-honda-k.4092553785" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen-honda-k.23414427" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 d4a7b5a868..baffb21712 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1336,7 +1336,7 @@ #define show_HellenNB1_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 611372368 +#define SIGNATURE_HASH 3606766066 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen-nb1.611372368" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen-nb1.3606766066" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 a5e6a144f2..7fd51bf2ab 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1336,7 +1336,7 @@ #define show_Hellen121nissan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2001570511 +#define SIGNATURE_HASH 2244453997 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen121nissan.2001570511" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen121nissan.2244453997" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 4b2aa58515..1d50d93593 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1336,7 +1336,7 @@ #define show_Hellen121vag_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 790927496 +#define SIGNATURE_HASH 3719214122 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen121vag.790927496" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen121vag.3719214122" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 3979461e72..dad0ee0de3 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1336,7 +1336,7 @@ #define show_Hellen128merc_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1245983416 +#define SIGNATURE_HASH 3100515866 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen128.1245983416" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen128.3100515866" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 c15ec54a77..3e9873c595 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1164695879 +#define SIGNATURE_HASH 3085039077 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen154hyundai.1164695879" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen154hyundai.3085039077" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 ea49ea42f0..375be7e2f0 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3056885717 +#define SIGNATURE_HASH 1153332087 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen154hyundai_f7.3056885717" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen154hyundai_f7.1153332087" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 de617caa4b..6a32fb7f94 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1336,7 +1336,7 @@ #define show_HellenNB2_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1526658457 +#define SIGNATURE_HASH 2826230075 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen72.1526658457" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen72.2826230075" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 02fb049473..9734e3893c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3259402409 +#define SIGNATURE_HASH 818717707 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen81.3259402409" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen81.818717707" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 e7a3c66dbc..4a3fce2c19 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1336,7 +1336,7 @@ #define show_Hellen88bmw_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3580206570 +#define SIGNATURE_HASH 670019912 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen88bmw.3580206570" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen88bmw.670019912" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 36d1e5103b..1213034ded 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1336,7 +1336,7 @@ #define show_HellenNA6_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 863239087 +#define SIGNATURE_HASH 3254376205 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellenNA6.863239087" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellenNA6.3254376205" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 a9535e5838..5b4534e15e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1337,7 +1337,7 @@ #define show_HellenNB1_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3433675105 +#define SIGNATURE_HASH 1042519491 #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" @@ -1805,14 +1805,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellenNA8_96.3433675105" +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellenNA8_96.1042519491" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 6487c6dcfe..0fc9a90ea7 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3250936784 +#define SIGNATURE_HASH 860845938 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.m74_9.3250936784" +#define TS_SIGNATURE "rusEFI master.2024.12.27.m74_9.860845938" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 a7cb5ba009..f2b5b0a28e 100644 --- a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h @@ -1334,7 +1334,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3970488716 +#define SIGNATURE_HASH 505607470 #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" @@ -1802,14 +1802,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.mre-legacy_f4.3970488716" +#define TS_SIGNATURE "rusEFI master.2024.12.27.mre-legacy_f4.505607470" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 937674fafc..2c7837862c 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1334,7 +1334,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3970488716 +#define SIGNATURE_HASH 505607470 #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" @@ -1802,14 +1802,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.mre_f4.3970488716" +#define TS_SIGNATURE "rusEFI master.2024.12.27.mre_f4.505607470" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 63e2c4988c..420ee0e513 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1334,7 +1334,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3970488716 +#define SIGNATURE_HASH 505607470 #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" @@ -1802,14 +1802,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.mre_f7.3970488716" +#define TS_SIGNATURE "rusEFI master.2024.12.27.mre_f7.505607470" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 cfe7970c41..0487e4926a 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2815825999 +#define SIGNATURE_HASH 1432106221 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.nucleo_f413.2815825999" +#define TS_SIGNATURE "rusEFI master.2024.12.27.nucleo_f413.1432106221" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 6ae57f93ce..b36d1288c6 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3392555279 +#define SIGNATURE_HASH 951870893 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.proteus_f4.3392555279" +#define TS_SIGNATURE "rusEFI master.2024.12.27.proteus_f4.951870893" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 e348f847bc..841224b44b 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3392555279 +#define SIGNATURE_HASH 951870893 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.proteus_f7.3392555279" +#define TS_SIGNATURE "rusEFI master.2024.12.27.proteus_f7.951870893" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 8b15af1192..405f883f23 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3392555279 +#define SIGNATURE_HASH 951870893 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.proteus_h7.3392555279" +#define TS_SIGNATURE "rusEFI master.2024.12.27.proteus_h7.951870893" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 0ca6949ed9..bcb262b346 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 408787085 +#define SIGNATURE_HASH 3940004911 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.s105.408787085" +#define TS_SIGNATURE "rusEFI master.2024.12.27.s105.3940004911" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 cd0c68e62b..e66958e0e6 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4214044002 +#define SIGNATURE_HASH 161946048 #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" @@ -1802,14 +1802,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.small-can-board.4214044002" +#define TS_SIGNATURE "rusEFI master.2024.12.27.small-can-board.161946048" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 c2b378b971..e36bd9fb13 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2815825999 +#define SIGNATURE_HASH 1432106221 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.stm32f429_nucleo.2815825999" +#define TS_SIGNATURE "rusEFI master.2024.12.27.stm32f429_nucleo.1432106221" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 d8540f73da..78ef4f9b1c 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2815825999 +#define SIGNATURE_HASH 1432106221 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.stm32f767_nucleo.2815825999" +#define TS_SIGNATURE "rusEFI master.2024.12.27.stm32f767_nucleo.1432106221" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 897f83a26b..7df85ec56e 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2815825999 +#define SIGNATURE_HASH 1432106221 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.stm32h743_nucleo.2815825999" +#define TS_SIGNATURE "rusEFI master.2024.12.27.stm32h743_nucleo.1432106221" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 e48927456b..2486eb721b 100644 --- a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4176945169 +#define SIGNATURE_HASH 175967411 #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" @@ -1804,14 +1804,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.subaru_eg33_f7.4176945169" +#define TS_SIGNATURE "rusEFI master.2024.12.27.subaru_eg33_f7.175967411" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 f1ffcdca27..72d33c4401 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2815825999 +#define SIGNATURE_HASH 1432106221 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.t-b-g.2815825999" +#define TS_SIGNATURE "rusEFI master.2024.12.27.t-b-g.1432106221" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 252c6a1c36..7712eb8c54 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2650514631 +#define SIGNATURE_HASH 1869711461 #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" @@ -1803,14 +1803,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.tdg-pdm8.2650514631" +#define TS_SIGNATURE "rusEFI master.2024.12.27.tdg-pdm8.1869711461" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 40a6fc87d8..fc87866011 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1329,7 +1329,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2811205212 +#define SIGNATURE_HASH 1426438910 #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" @@ -1798,14 +1798,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.uaefi.2811205212" +#define TS_SIGNATURE "rusEFI master.2024.12.27.uaefi.1426438910" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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_uaefi121.h b/firmware/controllers/generated/rusefi_generated_uaefi121.h index 9b4aa83eec..d8fc919263 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi121.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi121.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1363307825 +#define SIGNATURE_HASH 2747810195 #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" @@ -1801,14 +1801,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.26.uaefi121.1363307825" +#define TS_SIGNATURE "rusEFI master.2024.12.27.uaefi121.2747810195" #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 1808 +#define TS_TOTAL_OUTPUT_SIZE 1804 #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 eb0dc97522..3739b90499 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 1752384059 -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-2chan.1752384059" +#define SIGNATURE_HASH 2600038041 +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-2chan.2600038041" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index f0e5734d44..9d27658b57 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 569095602 -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-4chan.569095602" +#define SIGNATURE_HASH 3546388752 +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-4chan.3546388752" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index fed144cd10..c10cb90162 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 569095602 -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-4chan_f7.569095602" +#define SIGNATURE_HASH 3546388752 +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-4chan_f7.3546388752" diff --git a/firmware/controllers/generated/signature_alphax-4k-gdi.h b/firmware/controllers/generated/signature_alphax-4k-gdi.h index 33503a1721..70cce9f772 100644 --- a/firmware/controllers/generated/signature_alphax-4k-gdi.h +++ b/firmware/controllers/generated/signature_alphax-4k-gdi.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 1330472868 -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-4k-gdi.1330472868" +#define SIGNATURE_HASH 3183954694 +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-4k-gdi.3183954694" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index b679365864..50309fb924 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 1586820639 -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-8chan-revA.1586820639" +#define SIGNATURE_HASH 2887703229 +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-8chan-revA.2887703229" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 913615a904..bb9a959454 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 2614108839 -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-8chan.2614108839" +#define SIGNATURE_HASH 1767509509 +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-8chan.1767509509" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 3ce6d9387d..62769830eb 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 2614108839 -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-8chan_f7.2614108839" +#define SIGNATURE_HASH 1767509509 +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-8chan_f7.1767509509" diff --git a/firmware/controllers/generated/signature_alphax-silver.h b/firmware/controllers/generated/signature_alphax-silver.h index 4221270bd5..d43e0f34b3 100644 --- a/firmware/controllers/generated/signature_alphax-silver.h +++ b/firmware/controllers/generated/signature_alphax-silver.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 1761253893 -#define TS_SIGNATURE "rusEFI master.2024.12.26.alphax-silver.1761253893" +#define SIGNATURE_HASH 2591078055 +#define TS_SIGNATURE "rusEFI master.2024.12.27.alphax-silver.2591078055" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index b877874cd4..a456b1657c 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 2815825999 -#define TS_SIGNATURE "rusEFI master.2024.12.26.at_start_f435.2815825999" +#define SIGNATURE_HASH 1432106221 +#define TS_SIGNATURE "rusEFI master.2024.12.27.at_start_f435.1432106221" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 5efffab1ab..ba55fce607 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 3822177281 -#define TS_SIGNATURE "rusEFI master.2024.12.26.atlas.3822177281" +#define SIGNATURE_HASH 291233955 +#define TS_SIGNATURE "rusEFI master.2024.12.27.atlas.291233955" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 5dc829ddaf..a76774147e 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 1198445042 -#define TS_SIGNATURE "rusEFI master.2024.12.26.f407-discovery.1198445042" +#define SIGNATURE_HASH 3051683152 +#define TS_SIGNATURE "rusEFI master.2024.12.27.f407-discovery.3051683152" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index b1f381dcb6..267abbe105 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 2815825999 -#define TS_SIGNATURE "rusEFI master.2024.12.26.f429-discovery.2815825999" +#define SIGNATURE_HASH 1432106221 +#define TS_SIGNATURE "rusEFI master.2024.12.27.f429-discovery.1432106221" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index 656365db15..02039cc999 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 2499878620 -#define TS_SIGNATURE "rusEFI master.2024.12.26.f469-discovery.2499878620" +#define SIGNATURE_HASH 1737175678 +#define TS_SIGNATURE "rusEFI master.2024.12.27.f469-discovery.1737175678" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 8f973ab5af..4e77f2dd23 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 4048907348 -#define TS_SIGNATURE "rusEFI master.2024.12.26.frankenso_na6.4048907348" +#define SIGNATURE_HASH 64962806 +#define TS_SIGNATURE "rusEFI master.2024.12.27.frankenso_na6.64962806" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index cb5a17107c..574ae3778a 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 2815825999 -#define TS_SIGNATURE "rusEFI master.2024.12.26.haba208.2815825999" +#define SIGNATURE_HASH 1432106221 +#define TS_SIGNATURE "rusEFI master.2024.12.27.haba208.1432106221" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index f7ea5588e5..e31206925e 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 786333899 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen-112-17.786333899" +#define SIGNATURE_HASH 3696536681 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen-112-17.3696536681" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index a8cfd3dda6..8536a8fb61 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 1806663671 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen-gm-e67.1806663671" +#define SIGNATURE_HASH 2569360213 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen-gm-e67.2569360213" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 2679ee0b20..5efc99873c 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 4092553785 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen-honda-k.4092553785" +#define SIGNATURE_HASH 23414427 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen-honda-k.23414427" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 2372183bbf..569cf7f7c6 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 611372368 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen-nb1.611372368" +#define SIGNATURE_HASH 3606766066 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen-nb1.3606766066" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 9c58c7a145..cd053d83dc 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 2001570511 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen121nissan.2001570511" +#define SIGNATURE_HASH 2244453997 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen121nissan.2244453997" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 58f83f304d..939e8b83ba 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 790927496 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen121vag.790927496" +#define SIGNATURE_HASH 3719214122 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen121vag.3719214122" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index a729eeb375..61d4181890 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 1245983416 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen128.1245983416" +#define SIGNATURE_HASH 3100515866 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen128.3100515866" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index cd4292940d..59383e057f 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 1164695879 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen154hyundai.1164695879" +#define SIGNATURE_HASH 3085039077 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen154hyundai.3085039077" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index fa4d0c874d..20ace38ac9 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 3056885717 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen154hyundai_f7.3056885717" +#define SIGNATURE_HASH 1153332087 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen154hyundai_f7.1153332087" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 663c44dab3..d6ce5493b4 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 1526658457 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen72.1526658457" +#define SIGNATURE_HASH 2826230075 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen72.2826230075" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 734c5f2391..897d4cd231 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 3259402409 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen81.3259402409" +#define SIGNATURE_HASH 818717707 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen81.818717707" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index b27bf6c045..25356a0dfb 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 3580206570 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellen88bmw.3580206570" +#define SIGNATURE_HASH 670019912 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellen88bmw.670019912" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 35e3c9b8a1..9c1715c318 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 863239087 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellenNA6.863239087" +#define SIGNATURE_HASH 3254376205 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellenNA6.3254376205" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 902a039d93..dd7919eee8 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 3433675105 -#define TS_SIGNATURE "rusEFI master.2024.12.26.hellenNA8_96.3433675105" +#define SIGNATURE_HASH 1042519491 +#define TS_SIGNATURE "rusEFI master.2024.12.27.hellenNA8_96.1042519491" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 9b3545d675..96ead5b6da 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 3250936784 -#define TS_SIGNATURE "rusEFI master.2024.12.26.m74_9.3250936784" +#define SIGNATURE_HASH 860845938 +#define TS_SIGNATURE "rusEFI master.2024.12.27.m74_9.860845938" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index 3fe6c2df10..55737e1813 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 3970488716 -#define TS_SIGNATURE "rusEFI master.2024.12.26.mre-legacy_f4.3970488716" +#define SIGNATURE_HASH 505607470 +#define TS_SIGNATURE "rusEFI master.2024.12.27.mre-legacy_f4.505607470" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c61403e3a1..246745a7a0 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 3970488716 -#define TS_SIGNATURE "rusEFI master.2024.12.26.mre_f4.3970488716" +#define SIGNATURE_HASH 505607470 +#define TS_SIGNATURE "rusEFI master.2024.12.27.mre_f4.505607470" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 47ab1e4e9e..abd1c541af 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 3970488716 -#define TS_SIGNATURE "rusEFI master.2024.12.26.mre_f7.3970488716" +#define SIGNATURE_HASH 505607470 +#define TS_SIGNATURE "rusEFI master.2024.12.27.mre_f7.505607470" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index 8f5fc0f24c..f728f391fa 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 2815825999 -#define TS_SIGNATURE "rusEFI master.2024.12.26.nucleo_f413.2815825999" +#define SIGNATURE_HASH 1432106221 +#define TS_SIGNATURE "rusEFI master.2024.12.27.nucleo_f413.1432106221" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 4c36d1862f..a983da94b9 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 3392555279 -#define TS_SIGNATURE "rusEFI master.2024.12.26.proteus_f4.3392555279" +#define SIGNATURE_HASH 951870893 +#define TS_SIGNATURE "rusEFI master.2024.12.27.proteus_f4.951870893" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d43bf466c5..7ee77cf789 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 3392555279 -#define TS_SIGNATURE "rusEFI master.2024.12.26.proteus_f7.3392555279" +#define SIGNATURE_HASH 951870893 +#define TS_SIGNATURE "rusEFI master.2024.12.27.proteus_f7.951870893" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 0843987168..9aeb5b6dc1 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 3392555279 -#define TS_SIGNATURE "rusEFI master.2024.12.26.proteus_h7.3392555279" +#define SIGNATURE_HASH 951870893 +#define TS_SIGNATURE "rusEFI master.2024.12.27.proteus_h7.951870893" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 1d7903a516..81805fef64 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 408787085 -#define TS_SIGNATURE "rusEFI master.2024.12.26.s105.408787085" +#define SIGNATURE_HASH 3940004911 +#define TS_SIGNATURE "rusEFI master.2024.12.27.s105.3940004911" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 52de944a7d..8ec24ced2a 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 4214044002 -#define TS_SIGNATURE "rusEFI master.2024.12.26.small-can-board.4214044002" +#define SIGNATURE_HASH 161946048 +#define TS_SIGNATURE "rusEFI master.2024.12.27.small-can-board.161946048" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index ee25a22f08..66c4a484fc 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 2815825999 -#define TS_SIGNATURE "rusEFI master.2024.12.26.stm32f429_nucleo.2815825999" +#define SIGNATURE_HASH 1432106221 +#define TS_SIGNATURE "rusEFI master.2024.12.27.stm32f429_nucleo.1432106221" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index ae74cd880c..55b7286f0a 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 2815825999 -#define TS_SIGNATURE "rusEFI master.2024.12.26.stm32f767_nucleo.2815825999" +#define SIGNATURE_HASH 1432106221 +#define TS_SIGNATURE "rusEFI master.2024.12.27.stm32f767_nucleo.1432106221" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index f885b7814f..20db3562b6 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 2815825999 -#define TS_SIGNATURE "rusEFI master.2024.12.26.stm32h743_nucleo.2815825999" +#define SIGNATURE_HASH 1432106221 +#define TS_SIGNATURE "rusEFI master.2024.12.27.stm32h743_nucleo.1432106221" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index f96e862418..b9f294b1f6 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 4176945169 -#define TS_SIGNATURE "rusEFI master.2024.12.26.subaru_eg33_f7.4176945169" +#define SIGNATURE_HASH 175967411 +#define TS_SIGNATURE "rusEFI master.2024.12.27.subaru_eg33_f7.175967411" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 39ccb1ffb8..fb4e8fb0f5 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 2815825999 -#define TS_SIGNATURE "rusEFI master.2024.12.26.t-b-g.2815825999" +#define SIGNATURE_HASH 1432106221 +#define TS_SIGNATURE "rusEFI master.2024.12.27.t-b-g.1432106221" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 996ffe3a89..04b2429b29 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 2650514631 -#define TS_SIGNATURE "rusEFI master.2024.12.26.tdg-pdm8.2650514631" +#define SIGNATURE_HASH 1869711461 +#define TS_SIGNATURE "rusEFI master.2024.12.27.tdg-pdm8.1869711461" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 3657b2d896..ebe21099d7 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 2811205212 -#define TS_SIGNATURE "rusEFI master.2024.12.26.uaefi.2811205212" +#define SIGNATURE_HASH 1426438910 +#define TS_SIGNATURE "rusEFI master.2024.12.27.uaefi.1426438910" diff --git a/firmware/controllers/generated/signature_uaefi121.h b/firmware/controllers/generated/signature_uaefi121.h index ca6c3bca16..d3d5fda45c 100644 --- a/firmware/controllers/generated/signature_uaefi121.h +++ b/firmware/controllers/generated/signature_uaefi121.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 1363307825 -#define TS_SIGNATURE "rusEFI master.2024.12.26.uaefi121.1363307825" +#define SIGNATURE_HASH 2747810195 +#define TS_SIGNATURE "rusEFI master.2024.12.27.uaefi121.2747810195" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 77842ed9b0..e749abd3c2 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1411,9 +1411,6 @@ float getOutputValueByName(const char *name) { // tractionControlSparkSkip case -1555684830: return engine->engineState.tractionControlSparkSkip; -// desiredRpmLimit - case -505351565: - return engine->engineState.desiredRpmLimit; // fuelInjectionCounter case -1839290700: return engine->engineState.fuelInjectionCounter; diff --git a/firmware/live_data_generated/engine_state_generated.h b/firmware/live_data_generated/engine_state_generated.h index 242c72349e..a5468752bd 100644 --- a/firmware/live_data_generated/engine_state_generated.h +++ b/firmware/live_data_generated/engine_state_generated.h @@ -344,63 +344,51 @@ struct engine_state_s { * offset 68 */ float tractionControlSparkSkip = (float)0; - /** - * User-defined RPM hard limit - * units: rpm - * offset 72 - */ - int16_t desiredRpmLimit = (int16_t)0; - /** - * need 4 byte alignment - * units: units - * offset 74 - */ - uint8_t alignmentFill_at_74[2]; /** * Fuel: Injection counter - * offset 76 + * offset 72 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** * Ign: Spark counter - * offset 80 + * offset 76 */ uint32_t globalSparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 84 + * offset 80 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 88 + * offset 84 */ float ignitionLoad = (float)0; /** * units: % - * offset 92 + * offset 88 */ scaled_channel veTableYAxis = (uint16_t)0; /** - * offset 94 + * offset 90 */ uint8_t overDwellCounter = (uint8_t)0; /** - * offset 95 + * offset 91 */ uint8_t overDwellNotScheduledCounter = (uint8_t)0; /** - * offset 96 + * offset 92 */ uint8_t sparkOutOfOrderCounter = (uint8_t)0; /** * need 4 byte alignment * units: units - * offset 97 + * offset 93 */ - uint8_t alignmentFill_at_97[3]; + uint8_t alignmentFill_at_93[3]; }; -static_assert(sizeof(engine_state_s) == 100); +static_assert(sizeof(engine_state_s) == 96); // end // this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index f912a5368f..f4f5924e5d 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.12.26.f407-discovery.1198445042" + signature = "rusEFI master.2024.12.27.f407-discovery.3051683152" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.f407-discovery.1198445042" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.f407-discovery.3051683152" ; 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 @@ -2652,7 +2652,7 @@ communityCommsLedPin = bits, U16, 23344, [0:8], $gpio_list ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3390,203 +3390,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5993,7 +5992,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7042,16 +7040,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 785cc082b5..fdc686e3f2 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.12.26.alphax-2chan.1752384059" + signature = "rusEFI master.2024.12.27.alphax-2chan.2600038041" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.alphax-2chan.1752384059" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.alphax-2chan.2600038041" ; 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 @@ -2656,7 +2656,7 @@ boardUseCamPullDown = bits, U32, 23344, [4:4], "With Pull Up", "With Pull Down" ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3394,203 +3394,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5990,7 +5989,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7023,16 +7021,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 1b9c1bf792..cad227df44 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.12.26.alphax-4chan.569095602" + signature = "rusEFI master.2024.12.27.alphax-4chan.3546388752" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.alphax-4chan.569095602" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.alphax-4chan.3546388752" ; 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 @@ -2661,7 +2661,7 @@ boardUseD3PullDown = bits, U32, 23344, [9:9], "With Pull Up", "With Pull Down" ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3399,203 +3399,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -6002,7 +6001,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7064,16 +7062,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 8cba2bd80e..de82ee8b6b 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.12.26.alphax-4chan_f7.569095602" + signature = "rusEFI master.2024.12.27.alphax-4chan_f7.3546388752" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.alphax-4chan_f7.569095602" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.alphax-4chan_f7.3546388752" ; 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 @@ -2661,7 +2661,7 @@ boardUseD3PullDown = bits, U32, 23344, [9:9], "With Pull Up", "With Pull Down" ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3399,203 +3399,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -6002,7 +6001,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7064,16 +7062,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini index b4dcb361e2..081faabb53 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.26.alphax-4k-gdi.1330472868" + signature = "rusEFI master.2024.12.27.alphax-4k-gdi.3183954694" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.alphax-4k-gdi.1330472868" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.alphax-4k-gdi.3183954694" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 41334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5988,7 +5987,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7040,16 +7038,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index b4acabf351..02b2fb0b7c 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.12.26.alphax-8chan-revA.1586820639" + signature = "rusEFI master.2024.12.27.alphax-8chan-revA.2887703229" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.alphax-8chan-revA.1586820639" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.alphax-8chan-revA.2887703229" ; 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 @@ -2656,7 +2656,7 @@ boardUseTachPullUp = bits, U32, 23344, [4:4], "5v", "12v" ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3394,203 +3394,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5996,7 +5995,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7040,16 +7038,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index b81f1828aa..b1552330fe 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.12.26.alphax-8chan.2614108839" + signature = "rusEFI master.2024.12.27.alphax-8chan.1767509509" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.alphax-8chan.2614108839" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.alphax-8chan.1767509509" ; 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 @@ -2665,7 +2665,7 @@ boardUseFlexPullDown = bits, U32, 23360, [10:10], "With Pull Up", "With Pull Dow ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3403,203 +3403,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -6006,7 +6005,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7063,16 +7061,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 847478e911..cb617bd697 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.12.26.alphax-8chan_f7.2614108839" + signature = "rusEFI master.2024.12.27.alphax-8chan_f7.1767509509" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.alphax-8chan_f7.2614108839" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.alphax-8chan_f7.1767509509" ; 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 @@ -2665,7 +2665,7 @@ boardUseFlexPullDown = bits, U32, 23360, [10:10], "With Pull Up", "With Pull Dow ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3403,203 +3403,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -6006,7 +6005,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7063,16 +7061,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini index 6ae136e7a3..c9b9831e97 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.26.alphax-silver.1761253893" + signature = "rusEFI master.2024.12.27.alphax-silver.2591078055" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.alphax-silver.1761253893" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.alphax-silver.2591078055" ; 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 @@ -2652,7 +2652,7 @@ targetAfrBlends2_blendValues = array, U08, 23338, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3390,203 +3390,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5986,7 +5985,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7020,16 +7018,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 0b421c48c4..9cba4ca8d0 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.12.26.at_start_f435.2815825999" + signature = "rusEFI master.2024.12.27.at_start_f435.1432106221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.at_start_f435.2815825999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.at_start_f435.1432106221" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index a7ad2cc97c..8d6c3c9615 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.12.26.atlas.3822177281" + signature = "rusEFI master.2024.12.27.atlas.291233955" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.atlas.3822177281" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.atlas.291233955" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 22834, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index f912a5368f..f4f5924e5d 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.12.26.f407-discovery.1198445042" + signature = "rusEFI master.2024.12.27.f407-discovery.3051683152" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.f407-discovery.1198445042" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.f407-discovery.3051683152" ; 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 @@ -2652,7 +2652,7 @@ communityCommsLedPin = bits, U16, 23344, [0:8], $gpio_list ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3390,203 +3390,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5993,7 +5992,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7042,16 +7040,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 635256a0ff..e6b716d405 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.12.26.f429-discovery.2815825999" + signature = "rusEFI master.2024.12.27.f429-discovery.1432106221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.f429-discovery.2815825999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.f429-discovery.1432106221" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 9858f21f30..8a82e6b64e 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.12.26.f469-discovery.2499878620" + signature = "rusEFI master.2024.12.27.f469-discovery.1737175678" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.f469-discovery.2499878620" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.f469-discovery.1737175678" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index ae2e8aedfc..6adda8f544 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.12.26.frankenso_na6.4048907348" + signature = "rusEFI master.2024.12.27.frankenso_na6.64962806" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.frankenso_na6.4048907348" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.frankenso_na6.64962806" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index bf1b5e1b68..87697f288c 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.12.26.haba208.2815825999" + signature = "rusEFI master.2024.12.27.haba208.1432106221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.haba208.2815825999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.haba208.1432106221" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 221bfaa8e9..1f5f19d6d1 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.12.26.hellen-112-17.786333899" + signature = "rusEFI master.2024.12.27.hellen-112-17.3696536681" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen-112-17.786333899" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen-112-17.3696536681" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7034,16 +7032,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index ea090d1502..685b20298c 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.12.26.hellen-gm-e67.1806663671" + signature = "rusEFI master.2024.12.27.hellen-gm-e67.2569360213" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen-gm-e67.1806663671" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen-gm-e67.2569360213" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7036,16 +7034,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 8d40233572..7d3b96602a 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.12.26.hellen-honda-k.4092553785" + signature = "rusEFI master.2024.12.27.hellen-honda-k.23414427" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen-honda-k.4092553785" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen-honda-k.23414427" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -2592,7 +2592,7 @@ unusedConfigPadding = array, U08, 23793, [36], "", 1, 0, 0, 100, 0 ochGetCommand = "O%2o%2c" - ochBlockSize = 1808 + ochBlockSize = 1804 scatteredOchGetCommand = 9 scatteredOffsetArray = highSpeedOffsets @@ -3322,203 +3322,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5845,7 +5844,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -6855,16 +6853,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index c058e64367..6c89065d90 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.12.26.hellen-nb1.611372368" + signature = "rusEFI master.2024.12.27.hellen-nb1.3606766066" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen-nb1.611372368" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen-nb1.3606766066" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7036,16 +7034,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 951b68b816..2e5e90d94f 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.12.26.hellen121nissan.2001570511" + signature = "rusEFI master.2024.12.27.hellen121nissan.2244453997" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen121nissan.2001570511" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen121nissan.2244453997" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7033,16 +7031,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index bf4be69592..31eb843a37 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.12.26.hellen121vag.790927496" + signature = "rusEFI master.2024.12.27.hellen121vag.3719214122" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen121vag.790927496" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen121vag.3719214122" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index ad093f7864..e0e224d906 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.12.26.hellen128.1245983416" + signature = "rusEFI master.2024.12.27.hellen128.3100515866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen128.1245983416" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen128.3100515866" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7036,16 +7034,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index d2abf6d5dc..4532e377f6 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.12.26.hellen154hyundai.1164695879" + signature = "rusEFI master.2024.12.27.hellen154hyundai.3085039077" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen154hyundai.1164695879" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen154hyundai.3085039077" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5987,7 +5986,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7018,16 +7016,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index 7aee7b6240..cd5d2b3325 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.12.26.hellen154hyundai_f7.3056885717" + signature = "rusEFI master.2024.12.27.hellen154hyundai_f7.1153332087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen154hyundai_f7.3056885717" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen154hyundai_f7.1153332087" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5987,7 +5986,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7019,16 +7017,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 52534c5784..451115ca23 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.12.26.hellen72.1526658457" + signature = "rusEFI master.2024.12.27.hellen72.2826230075" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen72.1526658457" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen72.2826230075" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7036,16 +7034,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index f397c924f5..2028357faf 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.12.26.hellen81.3259402409" + signature = "rusEFI master.2024.12.27.hellen81.818717707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen81.3259402409" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen81.818717707" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7034,16 +7032,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 44d10cd166..7d183e27c4 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.12.26.hellen88bmw.3580206570" + signature = "rusEFI master.2024.12.27.hellen88bmw.670019912" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellen88bmw.3580206570" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellen88bmw.670019912" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7033,16 +7031,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index c5dfa55e0c..3bf4e69583 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.12.26.hellenNA6.863239087" + signature = "rusEFI master.2024.12.27.hellenNA6.3254376205" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellenNA6.863239087" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellenNA6.3254376205" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7036,16 +7034,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index b4d9c5ba7a..cd9d244b1f 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.12.26.hellenNA8_96.3433675105" + signature = "rusEFI master.2024.12.27.hellenNA8_96.1042519491" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.hellenNA8_96.3433675105" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.hellenNA8_96.1042519491" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7036,16 +7034,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index b8d7ec89a4..edc41c7c48 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.12.26.m74_9.3250936784" + signature = "rusEFI master.2024.12.27.m74_9.860845938" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.m74_9.3250936784" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.m74_9.860845938" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 22790, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7038,16 +7036,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index a8197a924a..ead7ab1fa3 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.12.26.mre-legacy_f4.3970488716" + signature = "rusEFI master.2024.12.27.mre-legacy_f4.505607470" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.mre-legacy_f4.3970488716" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.mre-legacy_f4.505607470" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 25334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5989,7 +5988,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7051,16 +7049,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 9fc67de0ed..e984834671 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.12.26.mre_f4.3970488716" + signature = "rusEFI master.2024.12.27.mre_f4.505607470" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.mre_f4.3970488716" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.mre_f4.505607470" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 25334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5989,7 +5988,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7051,16 +7049,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index f515e5368a..97dccdafa7 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.12.26.mre_f7.3970488716" + signature = "rusEFI master.2024.12.27.mre_f7.505607470" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.mre_f7.3970488716" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.mre_f7.505607470" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 25334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5989,7 +5988,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7051,16 +7049,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index eda1b1f714..4ebc55ecfa 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.12.26.nucleo_f413.2815825999" + signature = "rusEFI master.2024.12.27.nucleo_f413.1432106221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.nucleo_f413.2815825999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.nucleo_f413.1432106221" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 171edcf241..17ae5e4640 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.12.26.proteus_f4.3392555279" + signature = "rusEFI master.2024.12.27.proteus_f4.951870893" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.proteus_f4.3392555279" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.proteus_f4.951870893" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 28834, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5992,7 +5991,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7063,16 +7061,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index e26739d85c..349a11c1c8 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.12.26.proteus_f7.3392555279" + signature = "rusEFI master.2024.12.27.proteus_f7.951870893" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.proteus_f7.3392555279" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.proteus_f7.951870893" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 28834, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5992,7 +5991,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7063,16 +7061,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 47fc26cc31..e0ece1a0d4 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.12.26.proteus_h7.3392555279" + signature = "rusEFI master.2024.12.27.proteus_h7.951870893" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.proteus_h7.3392555279" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.proteus_h7.951870893" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 28834, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5992,7 +5991,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7063,16 +7061,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index f0927bbaed..3cff99dc1b 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.12.26.s105.408787085" + signature = "rusEFI master.2024.12.27.s105.3940004911" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.s105.408787085" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.s105.3940004911" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7036,16 +7034,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 1a5c76f4fe..68288641d1 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.12.26.small-can-board.4214044002" + signature = "rusEFI master.2024.12.27.small-can-board.161946048" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.small-can-board.4214044002" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.small-can-board.161946048" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 163e080eb1..b0b79aed96 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.12.26.stm32f429_nucleo.2815825999" + signature = "rusEFI master.2024.12.27.stm32f429_nucleo.1432106221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.stm32f429_nucleo.2815825999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.stm32f429_nucleo.1432106221" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index ffccacbbb2..e18821195b 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.12.26.stm32f767_nucleo.2815825999" + signature = "rusEFI master.2024.12.27.stm32f767_nucleo.1432106221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.stm32f767_nucleo.2815825999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.stm32f767_nucleo.1432106221" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index 9abbd65446..c5d13d65ce 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.12.26.stm32h743_nucleo.2815825999" + signature = "rusEFI master.2024.12.27.stm32h743_nucleo.1432106221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.stm32h743_nucleo.2815825999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.stm32h743_nucleo.1432106221" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 6ff0c507e8..2e931dd3c3 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.12.26.subaru_eg33_f7.4176945169" + signature = "rusEFI master.2024.12.27.subaru_eg33_f7.175967411" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.subaru_eg33_f7.4176945169" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.subaru_eg33_f7.175967411" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7037,16 +7035,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 4fc373f13c..f1d54e664e 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.12.26.t-b-g.2815825999" + signature = "rusEFI master.2024.12.27.t-b-g.1432106221" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.t-b-g.2815825999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.t-b-g.1432106221" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 013202937a..f3ce72f579 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.12.26.tdg-pdm8.2650514631" + signature = "rusEFI master.2024.12.27.tdg-pdm8.1869711461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.tdg-pdm8.2650514631" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.tdg-pdm8.1869711461" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5991,7 +5990,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7035,16 +7033,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index ad3d403099..ede175ffc4 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.12.26.uaefi.2811205212" + signature = "rusEFI master.2024.12.27.uaefi.1426438910" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.uaefi.2811205212" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.uaefi.1426438910" ; 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 @@ -2654,7 +2654,7 @@ rainTimingPpsBins = array, F32, 23368, [4], "C", 1, 0, -100, 120, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3392,203 +3392,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -6002,7 +6001,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7067,16 +7065,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_uaefi121.ini b/firmware/tunerstudio/generated/rusefi_uaefi121.ini index 78192a0214..abe91e7410 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi121.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi121.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.26.uaefi121.1363307825" + signature = "rusEFI master.2024.12.27.uaefi121.2747810195" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.26.uaefi121.1363307825" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.27.uaefi121.2747810195" ; 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 @@ -2651,7 +2651,7 @@ targetAfrBlends2_blendValues = array, U08, 23334, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1808 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3389,203 +3389,202 @@ startStopStateToggleCounter = scalar, U32, 1276, "", 1, 0 luaSoftSparkSkip = scalar, F32, 1280, "", 1, 0 luaHardSparkSkip = scalar, F32, 1284, "", 1, 0 tractionControlSparkSkip = scalar, F32, 1288, "", 1, 0 -desiredRpmLimit = scalar, S16, 1292, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1296, "", 1, 0 -globalSparkCounter = scalar, U32, 1300, "", 1, 0 -fuelingLoad = scalar, F32, 1304, "", 1, 0 -ignitionLoad = scalar, F32, 1308, "", 1, 0 -veTableYAxis = scalar, U16, 1312, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1314, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1315, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1316, "", 1, 0 -; total TS size = 1320 -tpsFrom = scalar, F32, 1320 -tpsTo = scalar, F32, 1324 -deltaTps = scalar, F32, 1328 -extraFuel = scalar, F32, 1332, "", 1, 0 -valueFromTable = scalar, F32, 1336, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1340, [0:0] -isBelowDecelThreshold = bits, U32, 1340, [1:1] -isTimeToResetAccumulator = bits, U32, 1340, [2:2] -isFractionalEnrichment = bits, U32, 1340, [3:3] -belowEpsilon = bits, U32, 1340, [4:4] -tooShort = bits, U32, 1340, [5:5] -fractionalInjFuel = scalar, F32, 1344, "", 1, 0 -accumulatedValue = scalar, F32, 1348, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1352, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1356, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1360, "", 1, 0 -cycleCnt = scalar, S32, 1364, "", 1, 0 -; total TS size = 1368 -hwEventCounters1 = scalar, U16, 1368, "", 1, 0 -hwEventCounters2 = scalar, U16, 1370, "", 1, 0 -hwEventCounters3 = scalar, U16, 1372, "", 1, 0 -hwEventCounters4 = scalar, U16, 1374, "", 1, 0 -vvtCamCounter = scalar, U16, 1376, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1380, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1384, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1388, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1389, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1392, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1396, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1400, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1404, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1408, [0:0] -triggerElapsedUs = scalar, U32, 1412, "", 1, 0 -; total TS size = 1416 -synchronizationCounter0 = scalar, U32, 1416, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1424, "", 1, 0 -vvtToothPosition10 = scalar, F32, 1428, "", 1, 0 -vvtToothPosition20 = scalar, F32, 1432, "", 1, 0 -vvtToothPosition30 = scalar, F32, 1436, "", 1, 0 -vvtToothPosition40 = scalar, F32, 1440, "", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1448, "", 1, 0 -; total TS size = 1452 -synchronizationCounter1 = scalar, U32, 1452, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1456, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1460, "", 1, 0 -vvtToothPosition11 = scalar, F32, 1464, "", 1, 0 -vvtToothPosition21 = scalar, F32, 1468, "", 1, 0 -vvtToothPosition31 = scalar, F32, 1472, "", 1, 0 -vvtToothPosition41 = scalar, F32, 1476, "", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1480, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1484, "", 1, 0 -; total TS size = 1488 -synchronizationCounter2 = scalar, U32, 1488, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1492, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1496, "", 1, 0 -vvtToothPosition12 = scalar, F32, 1500, "", 1, 0 -vvtToothPosition22 = scalar, F32, 1504, "", 1, 0 -vvtToothPosition32 = scalar, F32, 1508, "", 1, 0 -vvtToothPosition42 = scalar, F32, 1512, "", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1516, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1520, "", 1, 0 -; total TS size = 1524 -synchronizationCounter3 = scalar, U32, 1524, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1528, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1532, "", 1, 0 -vvtToothPosition13 = scalar, F32, 1536, "", 1, 0 -vvtToothPosition23 = scalar, F32, 1540, "", 1, 0 -vvtToothPosition33 = scalar, F32, 1544, "", 1, 0 -vvtToothPosition43 = scalar, F32, 1548, "", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1552, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1556, "", 1, 0 -; total TS size = 1560 -synchronizationCounter4 = scalar, U32, 1560, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1564, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1568, "", 1, 0 -vvtToothPosition14 = scalar, F32, 1572, "", 1, 0 -vvtToothPosition24 = scalar, F32, 1576, "", 1, 0 -vvtToothPosition34 = scalar, F32, 1580, "", 1, 0 -vvtToothPosition44 = scalar, F32, 1584, "", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1588, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1592, "", 1, 0 -; total TS size = 1596 -camResyncCounter = scalar, U08, 1596, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1600, [0:0] -; total TS size = 1604 -wallFuelCorrection = scalar, F32, 1604, "", 1, 0 -wallFuel = scalar, F32, 1608, "", 1, 0 -; total TS size = 1612 -idleState = bits, S32, 1612, [0:2], "not important" -currentIdlePosition = scalar, F32, 1616 -baseIdlePosition = scalar, F32, 1620 -idleClosedLoop = scalar, F32, 1624 -iacByTpsTaper = scalar, F32, 1628 -mightResetPid = bits, U32, 1632, [0:0] -shouldResetPid = bits, U32, 1632, [1:1] -wasResetPid = bits, U32, 1632, [2:2] -mustResetPid = bits, U32, 1632, [3:3] -isCranking = bits, U32, 1632, [4:4] -isIacTableForCoasting = bits, U32, 1632, [5:5] -notIdling = bits, U32, 1632, [6:6] -needReset = bits, U32, 1632, [7:7] -isInDeadZone = bits, U32, 1632, [8:8] -isBlipping = bits, U32, 1632, [9:9] -useClosedLoop = bits, U32, 1632, [10:10] -badTps = bits, U32, 1632, [11:11] -looksLikeRunning = bits, U32, 1632, [12:12] -looksLikeCoasting = bits, U32, 1632, [13:13] -looksLikeCrankToIdle = bits, U32, 1632, [14:14] -isIdleCoasting = bits, U32, 1632, [15:15] -isIdleClosedLoop = bits, U32, 1632, [16:16] -idleTarget = scalar, S32, 1636, "", 1, 0 -targetRpmByClt = scalar, S32, 1640, "", 1, 0 -targetRpmAc = scalar, S32, 1644, "", 1, 0 -iacByRpmTaper = scalar, F32, 1648 -luaAdd = scalar, F32, 1652 -; total TS size = 1656 -targetWithIdlePosition0 = scalar, F32, 1656, "%", 1,0 -trim0 = scalar, F32, 1660, "", 1, 0 -luaAdjustment0 = scalar, F32, 1664, "%", 1,0 -m_wastegatePosition0 = scalar, F32, 1668, "%", 1,0 -etbFeedForward0 = scalar, F32, 1672 -etbIntegralError0 = scalar, F32, 1676, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1680, "%", 1, 0 -m_adjustedTarget0 = scalar, S16, 1684, "%", 0.01, 0 -etbRevLimitActive0 = bits, U32, 1688, [0:0] -jamDetected0 = bits, U32, 1688, [1:1] -validPlantPosition0 = bits, U32, 1688, [2:2] -etbTpsErrorCounter0 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1694, "count", 1,0 -etbErrorCode0 = scalar, S08, 1696, "", 1, 0 -etbErrorCodeBlinker0 = scalar, S08, 1697, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1698, "%", 1, 0 -jamTimer0 = scalar, U16, 1700, "sec", 0.01, 0 -adjustedEtbTarget0 = scalar, S08, 1702, "%", 1, 0 -state0 = scalar, U08, 1703, "", 1, 0 -; total TS size = 1704 -targetWithIdlePosition1 = scalar, F32, 1704, "%", 1,0 -trim1 = scalar, F32, 1708, "", 1, 0 -luaAdjustment1 = scalar, F32, 1712, "%", 1,0 -m_wastegatePosition1 = scalar, F32, 1716, "%", 1,0 -etbFeedForward1 = scalar, F32, 1720 -etbIntegralError1 = scalar, F32, 1724, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1728, "%", 1, 0 -m_adjustedTarget1 = scalar, S16, 1732, "%", 0.01, 0 -etbRevLimitActive1 = bits, U32, 1736, [0:0] -jamDetected1 = bits, U32, 1736, [1:1] -validPlantPosition1 = bits, U32, 1736, [2:2] -etbTpsErrorCounter1 = scalar, U16, 1740, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1742, "count", 1,0 -etbErrorCode1 = scalar, S08, 1744, "", 1, 0 -etbErrorCodeBlinker1 = scalar, S08, 1745, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1746, "%", 1, 0 -jamTimer1 = scalar, U16, 1748, "sec", 0.01, 0 -adjustedEtbTarget1 = scalar, S08, 1750, "%", 1, 0 -state1 = scalar, U08, 1751, "", 1, 0 -; total TS size = 1752 -faultCode0 = scalar, U08, 1752, "", 1, 0 -heaterDuty0 = scalar, U08, 1753, "%", 1, 0 -pumpDuty0 = scalar, U08, 1754, "%", 1, 0 -tempC0 = scalar, U16, 1756, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1758, "V", 0.001, 0 -esr0 = scalar, U16, 1760, "ohm", 1, 0 -; total TS size = 1764 -faultCode1 = scalar, U08, 1764, "", 1, 0 -heaterDuty1 = scalar, U08, 1765, "%", 1, 0 -pumpDuty1 = scalar, U08, 1766, "%", 1, 0 -tempC1 = scalar, U16, 1768, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1770, "V", 0.001, 0 -esr1 = scalar, U16, 1772, "ohm", 1, 0 -; total TS size = 1776 -dcOutput0 = scalar, F32, 1776, "%", 1,0 -isEnabled0_int = scalar, U08, 1780, "%", 1,0 -isEnabled0 = bits, U32, 1784, [0:0] -; total TS size = 1788 -value0 = scalar, U16, 1788, "RAW", 1,0 -value1 = scalar, U16, 1790, "RAW", 1,0 -errorRate = scalar, F32, 1792, "% (don't belive me)", 1,0 +fuelInjectionCounter = scalar, U32, 1292, "", 1, 0 +globalSparkCounter = scalar, U32, 1296, "", 1, 0 +fuelingLoad = scalar, F32, 1300, "", 1, 0 +ignitionLoad = scalar, F32, 1304, "", 1, 0 +veTableYAxis = scalar, U16, 1308, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1310, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1311, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1312, "", 1, 0 +; total TS size = 1316 +tpsFrom = scalar, F32, 1316 +tpsTo = scalar, F32, 1320 +deltaTps = scalar, F32, 1324 +extraFuel = scalar, F32, 1328, "", 1, 0 +valueFromTable = scalar, F32, 1332, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1336, [0:0] +isBelowDecelThreshold = bits, U32, 1336, [1:1] +isTimeToResetAccumulator = bits, U32, 1336, [2:2] +isFractionalEnrichment = bits, U32, 1336, [3:3] +belowEpsilon = bits, U32, 1336, [4:4] +tooShort = bits, U32, 1336, [5:5] +fractionalInjFuel = scalar, F32, 1340, "", 1, 0 +accumulatedValue = scalar, F32, 1344, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1348, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1352, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1356, "", 1, 0 +cycleCnt = scalar, S32, 1360, "", 1, 0 +; total TS size = 1364 +hwEventCounters1 = scalar, U16, 1364, "", 1, 0 +hwEventCounters2 = scalar, U16, 1366, "", 1, 0 +hwEventCounters3 = scalar, U16, 1368, "", 1, 0 +hwEventCounters4 = scalar, U16, 1370, "", 1, 0 +vvtCamCounter = scalar, U16, 1372, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1376, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1380, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1384, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1385, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1388, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1392, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1396, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1400, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1404, [0:0] +triggerElapsedUs = scalar, U32, 1408, "", 1, 0 +; total TS size = 1412 +synchronizationCounter0 = scalar, U32, 1412, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1420, "", 1, 0 +vvtToothPosition10 = scalar, F32, 1424, "", 1, 0 +vvtToothPosition20 = scalar, F32, 1428, "", 1, 0 +vvtToothPosition30 = scalar, F32, 1432, "", 1, 0 +vvtToothPosition40 = scalar, F32, 1436, "", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1444, "", 1, 0 +; total TS size = 1448 +synchronizationCounter1 = scalar, U32, 1448, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1452, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1456, "", 1, 0 +vvtToothPosition11 = scalar, F32, 1460, "", 1, 0 +vvtToothPosition21 = scalar, F32, 1464, "", 1, 0 +vvtToothPosition31 = scalar, F32, 1468, "", 1, 0 +vvtToothPosition41 = scalar, F32, 1472, "", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1476, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1480, "", 1, 0 +; total TS size = 1484 +synchronizationCounter2 = scalar, U32, 1484, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1488, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1492, "", 1, 0 +vvtToothPosition12 = scalar, F32, 1496, "", 1, 0 +vvtToothPosition22 = scalar, F32, 1500, "", 1, 0 +vvtToothPosition32 = scalar, F32, 1504, "", 1, 0 +vvtToothPosition42 = scalar, F32, 1508, "", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1512, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1516, "", 1, 0 +; total TS size = 1520 +synchronizationCounter3 = scalar, U32, 1520, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1524, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1528, "", 1, 0 +vvtToothPosition13 = scalar, F32, 1532, "", 1, 0 +vvtToothPosition23 = scalar, F32, 1536, "", 1, 0 +vvtToothPosition33 = scalar, F32, 1540, "", 1, 0 +vvtToothPosition43 = scalar, F32, 1544, "", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1548, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1552, "", 1, 0 +; total TS size = 1556 +synchronizationCounter4 = scalar, U32, 1556, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1560, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1564, "", 1, 0 +vvtToothPosition14 = scalar, F32, 1568, "", 1, 0 +vvtToothPosition24 = scalar, F32, 1572, "", 1, 0 +vvtToothPosition34 = scalar, F32, 1576, "", 1, 0 +vvtToothPosition44 = scalar, F32, 1580, "", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1584, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1588, "", 1, 0 +; total TS size = 1592 +camResyncCounter = scalar, U08, 1592, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1596, [0:0] +; total TS size = 1600 +wallFuelCorrection = scalar, F32, 1600, "", 1, 0 +wallFuel = scalar, F32, 1604, "", 1, 0 +; total TS size = 1608 +idleState = bits, S32, 1608, [0:2], "not important" +currentIdlePosition = scalar, F32, 1612 +baseIdlePosition = scalar, F32, 1616 +idleClosedLoop = scalar, F32, 1620 +iacByTpsTaper = scalar, F32, 1624 +mightResetPid = bits, U32, 1628, [0:0] +shouldResetPid = bits, U32, 1628, [1:1] +wasResetPid = bits, U32, 1628, [2:2] +mustResetPid = bits, U32, 1628, [3:3] +isCranking = bits, U32, 1628, [4:4] +isIacTableForCoasting = bits, U32, 1628, [5:5] +notIdling = bits, U32, 1628, [6:6] +needReset = bits, U32, 1628, [7:7] +isInDeadZone = bits, U32, 1628, [8:8] +isBlipping = bits, U32, 1628, [9:9] +useClosedLoop = bits, U32, 1628, [10:10] +badTps = bits, U32, 1628, [11:11] +looksLikeRunning = bits, U32, 1628, [12:12] +looksLikeCoasting = bits, U32, 1628, [13:13] +looksLikeCrankToIdle = bits, U32, 1628, [14:14] +isIdleCoasting = bits, U32, 1628, [15:15] +isIdleClosedLoop = bits, U32, 1628, [16:16] +idleTarget = scalar, S32, 1632, "", 1, 0 +targetRpmByClt = scalar, S32, 1636, "", 1, 0 +targetRpmAc = scalar, S32, 1640, "", 1, 0 +iacByRpmTaper = scalar, F32, 1644 +luaAdd = scalar, F32, 1648 +; total TS size = 1652 +targetWithIdlePosition0 = scalar, F32, 1652, "%", 1,0 +trim0 = scalar, F32, 1656, "", 1, 0 +luaAdjustment0 = scalar, F32, 1660, "%", 1,0 +m_wastegatePosition0 = scalar, F32, 1664, "%", 1,0 +etbFeedForward0 = scalar, F32, 1668 +etbIntegralError0 = scalar, F32, 1672, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1676, "%", 1, 0 +m_adjustedTarget0 = scalar, S16, 1680, "%", 0.01, 0 +etbRevLimitActive0 = bits, U32, 1684, [0:0] +jamDetected0 = bits, U32, 1684, [1:1] +validPlantPosition0 = bits, U32, 1684, [2:2] +etbTpsErrorCounter0 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1690, "count", 1,0 +etbErrorCode0 = scalar, S08, 1692, "", 1, 0 +etbErrorCodeBlinker0 = scalar, S08, 1693, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1694, "%", 1, 0 +jamTimer0 = scalar, U16, 1696, "sec", 0.01, 0 +adjustedEtbTarget0 = scalar, S08, 1698, "%", 1, 0 +state0 = scalar, U08, 1699, "", 1, 0 +; total TS size = 1700 +targetWithIdlePosition1 = scalar, F32, 1700, "%", 1,0 +trim1 = scalar, F32, 1704, "", 1, 0 +luaAdjustment1 = scalar, F32, 1708, "%", 1,0 +m_wastegatePosition1 = scalar, F32, 1712, "%", 1,0 +etbFeedForward1 = scalar, F32, 1716 +etbIntegralError1 = scalar, F32, 1720, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1724, "%", 1, 0 +m_adjustedTarget1 = scalar, S16, 1728, "%", 0.01, 0 +etbRevLimitActive1 = bits, U32, 1732, [0:0] +jamDetected1 = bits, U32, 1732, [1:1] +validPlantPosition1 = bits, U32, 1732, [2:2] +etbTpsErrorCounter1 = scalar, U16, 1736, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1738, "count", 1,0 +etbErrorCode1 = scalar, S08, 1740, "", 1, 0 +etbErrorCodeBlinker1 = scalar, S08, 1741, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1742, "%", 1, 0 +jamTimer1 = scalar, U16, 1744, "sec", 0.01, 0 +adjustedEtbTarget1 = scalar, S08, 1746, "%", 1, 0 +state1 = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +faultCode0 = scalar, U08, 1748, "", 1, 0 +heaterDuty0 = scalar, U08, 1749, "%", 1, 0 +pumpDuty0 = scalar, U08, 1750, "%", 1, 0 +tempC0 = scalar, U16, 1752, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1754, "V", 0.001, 0 +esr0 = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +faultCode1 = scalar, U08, 1760, "", 1, 0 +heaterDuty1 = scalar, U08, 1761, "%", 1, 0 +pumpDuty1 = scalar, U08, 1762, "%", 1, 0 +tempC1 = scalar, U16, 1764, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1766, "V", 0.001, 0 +esr1 = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 +; total TS size = 1792 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 ; total TS size = 1796 -vvtTarget = scalar, U16, 1796, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1798, "%", 0.5, 0 -; total TS size = 1800 -lambdaCurrentlyGood = bits, U32, 1800, [0:0] -lambdaMonitorCut = bits, U32, 1800, [1:1] -lambdaTimeSinceGood = scalar, U16, 1804, "sec", 0.01, 0 -; total TS size = 1808 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 +; total TS size = 1804 time = { timeNow } @@ -5992,7 +5991,6 @@ entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" entry = globalSparkCounter, "Ign: Spark counter", int, "%d" entry = fuelingLoad, "Fuel: Load", float, "%.3f" @@ -7056,16 +7054,15 @@ dialog = engine_stateDialog, "engine_state" graphLine = luaHardSparkSkip liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip - graphLine = desiredRpmLimit graphLine = fuelInjectionCounter graphLine = globalSparkCounter - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad + liveGraph = engine_state_7_Graph, "Graph", South graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter - liveGraph = engine_state_8_Graph, "Graph", South graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java index 3d19602ff3..509b631e69 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 @@ -180,10 +180,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(1776); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1776); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1776); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1776); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1772); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1772); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1772); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1772); 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 6107c3f80e..677038d096 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 @@ -180,27 +180,27 @@ 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 TARGETWITHIDLEPOSITION = Field.create("TARGETWITHIDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1656); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1656); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1656); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1656); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1656); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1656); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1656); - public static final Field M_ADJUSTEDTARGET = Field.create("M_ADJUSTEDTARGET", 28, FieldType.INT16).setScale(0.01).setBaseOffset(1656); - public static final Field ALIGNMENTFILL_AT_30 = Field.create("ALIGNMENTFILL_AT_30", 30, FieldType.INT8).setScale(1.0).setBaseOffset(1656); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1656); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1656); - public static final Field VALIDPLANTPOSITION = Field.create("VALIDPLANTPOSITION", 32, FieldType.BIT, 2).setBaseOffset(1656); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 36, FieldType.INT16).setScale(1.0).setBaseOffset(1656); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 38, FieldType.INT16).setScale(1.0).setBaseOffset(1656); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 40, FieldType.INT8).setScale(1.0).setBaseOffset(1656); - public static final Field ETBERRORCODEBLINKER = Field.create("ETBERRORCODEBLINKER", 41, FieldType.INT8).setScale(1.0).setBaseOffset(1656); - public static final Field TCETBDROP = Field.create("TCETBDROP", 42, FieldType.INT8).setScale(1.0).setBaseOffset(1656); - public static final Field ALIGNMENTFILL_AT_43 = Field.create("ALIGNMENTFILL_AT_43", 43, FieldType.INT8).setScale(1.0).setBaseOffset(1656); - public static final Field JAMTIMER = Field.create("JAMTIMER", 44, FieldType.INT16).setScale(0.01).setBaseOffset(1656); - public static final Field ADJUSTEDETBTARGET = Field.create("ADJUSTEDETBTARGET", 46, FieldType.INT8).setScale(1.0).setBaseOffset(1656); - public static final Field STATE = Field.create("STATE", 47, FieldType.INT8).setScale(1.0).setBaseOffset(1656); + public static final Field TARGETWITHIDLEPOSITION = Field.create("TARGETWITHIDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1652); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1652); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1652); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1652); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1652); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1652); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1652); + public static final Field M_ADJUSTEDTARGET = Field.create("M_ADJUSTEDTARGET", 28, FieldType.INT16).setScale(0.01).setBaseOffset(1652); + public static final Field ALIGNMENTFILL_AT_30 = Field.create("ALIGNMENTFILL_AT_30", 30, FieldType.INT8).setScale(1.0).setBaseOffset(1652); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1652); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1652); + public static final Field VALIDPLANTPOSITION = Field.create("VALIDPLANTPOSITION", 32, FieldType.BIT, 2).setBaseOffset(1652); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 36, FieldType.INT16).setScale(1.0).setBaseOffset(1652); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 38, FieldType.INT16).setScale(1.0).setBaseOffset(1652); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 40, FieldType.INT8).setScale(1.0).setBaseOffset(1652); + public static final Field ETBERRORCODEBLINKER = Field.create("ETBERRORCODEBLINKER", 41, FieldType.INT8).setScale(1.0).setBaseOffset(1652); + public static final Field TCETBDROP = Field.create("TCETBDROP", 42, FieldType.INT8).setScale(1.0).setBaseOffset(1652); + public static final Field ALIGNMENTFILL_AT_43 = Field.create("ALIGNMENTFILL_AT_43", 43, FieldType.INT8).setScale(1.0).setBaseOffset(1652); + public static final Field JAMTIMER = Field.create("JAMTIMER", 44, FieldType.INT16).setScale(0.01).setBaseOffset(1652); + public static final Field ADJUSTEDETBTARGET = Field.create("ADJUSTEDETBTARGET", 46, FieldType.INT8).setScale(1.0).setBaseOffset(1652); + public static final Field STATE = Field.create("STATE", 47, FieldType.INT8).setScale(1.0).setBaseOffset(1652); public static final Field[] VALUES = { TARGETWITHIDLEPOSITION, TRIM, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 2a04ee9f1e..f52e18fb0b 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -221,17 +221,15 @@ public class EngineState { public static final Field LUASOFTSPARKSKIP = Field.create("LUASOFTSPARKSKIP", 60, FieldType.FLOAT).setBaseOffset(1220); public static final Field LUAHARDSPARKSKIP = Field.create("LUAHARDSPARKSKIP", 64, FieldType.FLOAT).setBaseOffset(1220); public static final Field TRACTIONCONTROLSPARKSKIP = Field.create("TRACTIONCONTROLSPARKSKIP", 68, FieldType.FLOAT).setBaseOffset(1220); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 72, FieldType.INT16).setScale(1.0).setBaseOffset(1220); - public static final Field ALIGNMENTFILL_AT_74 = Field.create("ALIGNMENTFILL_AT_74", 74, FieldType.INT8).setScale(1.0).setBaseOffset(1220); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 76, FieldType.INT).setScale(1.0).setBaseOffset(1220); - public static final Field GLOBALSPARKCOUNTER = Field.create("GLOBALSPARKCOUNTER", 80, FieldType.INT).setScale(1.0).setBaseOffset(1220); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 84, FieldType.FLOAT).setBaseOffset(1220); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 88, FieldType.FLOAT).setBaseOffset(1220); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 92, FieldType.INT16).setScale(0.01).setBaseOffset(1220); - public static final Field OVERDWELLCOUNTER = Field.create("OVERDWELLCOUNTER", 94, FieldType.INT8).setScale(1.0).setBaseOffset(1220); - public static final Field OVERDWELLNOTSCHEDULEDCOUNTER = Field.create("OVERDWELLNOTSCHEDULEDCOUNTER", 95, FieldType.INT8).setScale(1.0).setBaseOffset(1220); - public static final Field SPARKOUTOFORDERCOUNTER = Field.create("SPARKOUTOFORDERCOUNTER", 96, FieldType.INT8).setScale(1.0).setBaseOffset(1220); - public static final Field ALIGNMENTFILL_AT_97 = Field.create("ALIGNMENTFILL_AT_97", 97, FieldType.INT8).setScale(1.0).setBaseOffset(1220); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 72, FieldType.INT).setScale(1.0).setBaseOffset(1220); + public static final Field GLOBALSPARKCOUNTER = Field.create("GLOBALSPARKCOUNTER", 76, FieldType.INT).setScale(1.0).setBaseOffset(1220); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 80, FieldType.FLOAT).setBaseOffset(1220); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 84, FieldType.FLOAT).setBaseOffset(1220); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 88, FieldType.INT16).setScale(0.01).setBaseOffset(1220); + public static final Field OVERDWELLCOUNTER = Field.create("OVERDWELLCOUNTER", 90, FieldType.INT8).setScale(1.0).setBaseOffset(1220); + public static final Field OVERDWELLNOTSCHEDULEDCOUNTER = Field.create("OVERDWELLNOTSCHEDULEDCOUNTER", 91, FieldType.INT8).setScale(1.0).setBaseOffset(1220); + public static final Field SPARKOUTOFORDERCOUNTER = Field.create("SPARKOUTOFORDERCOUNTER", 92, FieldType.INT8).setScale(1.0).setBaseOffset(1220); + public static final Field ALIGNMENTFILL_AT_93 = Field.create("ALIGNMENTFILL_AT_93", 93, FieldType.INT8).setScale(1.0).setBaseOffset(1220); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -274,8 +272,6 @@ public class EngineState { LUASOFTSPARKSKIP, LUAHARDSPARKSKIP, TRACTIONCONTROLSPARKSKIP, - DESIREDRPMLIMIT, - ALIGNMENTFILL_AT_74, FUELINJECTIONCOUNTER, GLOBALSPARKCOUNTER, FUELINGLOAD, @@ -284,6 +280,6 @@ public class EngineState { OVERDWELLCOUNTER, OVERDWELLNOTSCHEDULEDCOUNTER, SPARKOUTOFORDERCOUNTER, - ALIGNMENTFILL_AT_97, + ALIGNMENTFILL_AT_93, }; } 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 a8e006b15b..ec5c0e21b4 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 @@ -1242,7 +1242,6 @@ public class Fields { public static final int SentInput_INPUT6 = 6; public static final int SentInput_INPUT7 = 7; public static final int SentInput_NONE = 0; - public static final int SIGNATURE_HASH = 1198445042; 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"; @@ -1508,11 +1507,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.12.26.f407-discovery.1198445042"; + public static final String TS_SIGNATURE = "rusEFI master.2024.12.27.f407-discovery.3051683152"; 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 = 1808; + public static final int TS_TOTAL_OUTPUT_SIZE = 1804; 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 355fc80f39..bdc17a2705 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 @@ -180,33 +180,33 @@ 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(1612); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1612); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1612); - public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1612); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1612); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1612); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1612); - public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1612); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1612); - public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1612); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1612); - public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1612); - public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1612); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1612); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1612); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1612); - public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1612); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1612); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1612); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1612); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 15).setBaseOffset(1612); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 20, FieldType.BIT, 16).setBaseOffset(1612); - public static final Field IDLETARGET = Field.create("IDLETARGET", 24, FieldType.INT).setScale(1.0).setBaseOffset(1612); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 28, FieldType.INT).setScale(1.0).setBaseOffset(1612); - public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 32, FieldType.INT).setScale(1.0).setBaseOffset(1612); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 36, FieldType.FLOAT).setBaseOffset(1612); - public static final Field LUAADD = Field.create("LUAADD", 40, FieldType.FLOAT).setBaseOffset(1612); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1608); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1608); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1608); + public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1608); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1608); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1608); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1608); + public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1608); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1608); + public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1608); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1608); + public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1608); + public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1608); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1608); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1608); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1608); + public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1608); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1608); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1608); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1608); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 15).setBaseOffset(1608); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 20, FieldType.BIT, 16).setBaseOffset(1608); + public static final Field IDLETARGET = Field.create("IDLETARGET", 24, FieldType.INT).setScale(1.0).setBaseOffset(1608); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 28, FieldType.INT).setScale(1.0).setBaseOffset(1608); + public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 32, FieldType.INT).setScale(1.0).setBaseOffset(1608); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 36, FieldType.FLOAT).setBaseOffset(1608); + public static final Field LUAADD = Field.create("LUAADD", 40, FieldType.FLOAT).setBaseOffset(1608); 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 8367510f5a..cd47f2f4e0 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 @@ -6,10 +6,10 @@ package com.rusefi.config.generated; import com.rusefi.config.*; public class LambdaMonitor { - public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1800); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1800); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1800); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1800); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1796); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1796); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1796); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1796); 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 2eb4b9d63d..c77da51508 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 @@ -180,9 +180,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(1788); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1788); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1788); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1784); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1784); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1784); public static final Field[] VALUES = { VALUE0, VALUE1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java index f51d79cc33..ee598416ce 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java @@ -180,23 +180,23 @@ public class TpsAccelState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1320); - public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1320); - public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1320); - public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1320); - public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1320); - public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1320); - public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1320); - public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1320); - public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1320); - public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1320); - public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1320); - public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1320); - public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1320); - public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1320); - public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1320); - public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1320); + public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1316); + public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1316); + public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1316); + public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1316); + public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1316); + public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1316); + public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1316); + public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1316); + public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1316); + public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1316); + public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1316); + public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1316); + public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1316); + public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1316); + public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1316); + public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1316); + public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1316); public static final Field[] VALUES = { TPSFROM, TPSTO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index 49bebdbde5..4a88bbeb3e 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 @@ -7,24 +7,24 @@ import com.rusefi.config.*; public class TriggerCentral { public static final int HW_EVENT_TYPES = 4; - public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1368); - public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1368); - public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1368); - public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 6, FieldType.INT16).setScale(1.0).setBaseOffset(1368); - public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1368); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1368); - public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 12, FieldType.FLOAT).setBaseOffset(1368); - public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 16, FieldType.FLOAT).setBaseOffset(1368); - public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 20, FieldType.INT8).setScale(1.0).setBaseOffset(1368); - public static final Field MAPVVT_SYNC_COUNTER = Field.create("MAPVVT_SYNC_COUNTER", 21, FieldType.INT8).setScale(1.0).setBaseOffset(1368); - public static final Field ALIGNMENTFILL_AT_22 = Field.create("ALIGNMENTFILL_AT_22", 22, FieldType.INT8).setScale(1.0).setBaseOffset(1368); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 24, FieldType.FLOAT).setBaseOffset(1368); - public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 28, FieldType.FLOAT).setBaseOffset(1368); - public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 32, FieldType.INT8).setScale(1.0).setBaseOffset(1368); - public static final Field ALIGNMENTFILL_AT_33 = Field.create("ALIGNMENTFILL_AT_33", 33, FieldType.INT8).setScale(1.0).setBaseOffset(1368); - public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 36, FieldType.FLOAT).setBaseOffset(1368); - public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 40, FieldType.BIT, 0).setBaseOffset(1368); - public static final Field TRIGGERELAPSEDUS = Field.create("TRIGGERELAPSEDUS", 44, FieldType.INT).setScale(1.0).setBaseOffset(1368); + public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1364); + public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1364); + public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1364); + public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 6, FieldType.INT16).setScale(1.0).setBaseOffset(1364); + public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1364); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1364); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 12, FieldType.FLOAT).setBaseOffset(1364); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 16, FieldType.FLOAT).setBaseOffset(1364); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 20, FieldType.INT8).setScale(1.0).setBaseOffset(1364); + public static final Field MAPVVT_SYNC_COUNTER = Field.create("MAPVVT_SYNC_COUNTER", 21, FieldType.INT8).setScale(1.0).setBaseOffset(1364); + public static final Field ALIGNMENTFILL_AT_22 = Field.create("ALIGNMENTFILL_AT_22", 22, FieldType.INT8).setScale(1.0).setBaseOffset(1364); + public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 24, FieldType.FLOAT).setBaseOffset(1364); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 28, FieldType.FLOAT).setBaseOffset(1364); + public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 32, FieldType.INT8).setScale(1.0).setBaseOffset(1364); + public static final Field ALIGNMENTFILL_AT_33 = Field.create("ALIGNMENTFILL_AT_33", 33, FieldType.INT8).setScale(1.0).setBaseOffset(1364); + public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 36, FieldType.FLOAT).setBaseOffset(1364); + public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 40, FieldType.BIT, 0).setBaseOffset(1364); + public static final Field TRIGGERELAPSEDUS = Field.create("TRIGGERELAPSEDUS", 44, FieldType.INT).setScale(1.0).setBaseOffset(1364); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 6ba7cb11db..2d1fa3e8f8 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 @@ -180,16 +180,16 @@ 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 SYNCHRONIZATIONCOUNTER = Field.create("SYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1416); - public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 4, FieldType.INT).setScale(1.0).setBaseOffset(1416); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 8, FieldType.FLOAT).setBaseOffset(1416); - public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 12, FieldType.FLOAT).setBaseOffset(1416); - public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 16, FieldType.FLOAT).setBaseOffset(1416); - public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 20, FieldType.FLOAT).setBaseOffset(1416); - public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 24, FieldType.FLOAT).setBaseOffset(1416); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 28, FieldType.FLOAT).setBaseOffset(1416); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 32, FieldType.INT8).setScale(1.0).setBaseOffset(1416); - public static final Field ALIGNMENTFILL_AT_33 = Field.create("ALIGNMENTFILL_AT_33", 33, FieldType.INT8).setScale(1.0).setBaseOffset(1416); + public static final Field SYNCHRONIZATIONCOUNTER = Field.create("SYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1412); + public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 4, FieldType.INT).setScale(1.0).setBaseOffset(1412); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 8, FieldType.FLOAT).setBaseOffset(1412); + public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 12, FieldType.FLOAT).setBaseOffset(1412); + public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 16, FieldType.FLOAT).setBaseOffset(1412); + public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 20, FieldType.FLOAT).setBaseOffset(1412); + public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 24, FieldType.FLOAT).setBaseOffset(1412); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 28, FieldType.FLOAT).setBaseOffset(1412); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 32, FieldType.INT8).setScale(1.0).setBaseOffset(1412); + public static final Field ALIGNMENTFILL_AT_33 = Field.create("ALIGNMENTFILL_AT_33", 33, FieldType.INT8).setScale(1.0).setBaseOffset(1412); public static final Field[] VALUES = { SYNCHRONIZATIONCOUNTER, VVTTOOTHDURATIONS0, 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 45fe4000f9..58eb48a138 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 @@ -180,9 +180,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(1596); - public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1596); - public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1596); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1592); + public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1592); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1592); 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 6e238fa893..0f10932ebd 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 @@ -6,9 +6,9 @@ package com.rusefi.config.generated; import com.rusefi.config.*; public class VvtState { - public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1796); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1796); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1796); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1792); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1792); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1792); 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 52550d7248..07b2c1d9a3 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 @@ -6,8 +6,8 @@ package com.rusefi.config.generated; import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1604); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1604); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1600); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1600); 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 f47dffdd29..eb5bbce0dd 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 @@ -6,14 +6,14 @@ package com.rusefi.config.generated; import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1752); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1752); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1752); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1752); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1752); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1752); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1752); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1752); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1748); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1748); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1748); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1748); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1748); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1748); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1748); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1748); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,