diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index bf9bb1a..b63c8d8 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -659,6 +659,7 @@ entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = clutchDownState, "Clutch: down", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = currentVe, "currentVe", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" diff --git a/generated/console/binary/generated/fancy_content.ini b/generated/console/binary/generated/fancy_content.ini index 22a413e..a608b2c 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/console/binary/generated/fancy_content.ini @@ -352,18 +352,20 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipAliveCounter liveGraph = engine_state_5_Graph, "Graph", South graphLine = startStopStateToggleCounter + graphLine = currentVe graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip - graphLine = tractionControlSparkSkip liveGraph = engine_state_6_Graph, "Graph", South + graphLine = tractionControlSparkSkip graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/generated/console/binary/generated/live_data_fragments.ini b/generated/console/binary/generated/live_data_fragments.ini index 300ca87..1e2e38d 100644 --- a/generated/console/binary/generated/live_data_fragments.ini +++ b/generated/console/binary/generated/live_data_fragments.ini @@ -728,202 +728,203 @@ luaDigitalState2 = bits, U32, 1300, [6:6] luaDigitalState3 = bits, U32, 1300, [7:7] clutchDownState = bits, U32, 1300, [8:8] startStopStateToggleCounter = scalar, U32, 1304, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1308, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1312, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1316, "", 1, 0 -fuelInjectionCounter = scalar, U32, 1320, "", 1, 0 -globalSparkCounter = scalar, U32, 1324, "", 1, 0 -fuelingLoad = scalar, F32, 1328, "", 1, 0 -ignitionLoad = scalar, F32, 1332, "", 1, 0 -veTableYAxis = scalar, U16, 1336, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1338, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1339, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1340, "", 1, 0 -; total TS size = 1344 -tpsFrom = scalar, F32, 1344 -tpsTo = scalar, F32, 1348 -deltaTps = scalar, F32, 1352 -extraFuel = scalar, F32, 1356, "", 1, 0 -valueFromTable = scalar, F32, 1360, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1364, [0:0] -isBelowDecelThreshold = bits, U32, 1364, [1:1] -isTimeToResetAccumulator = bits, U32, 1364, [2:2] -isFractionalEnrichment = bits, U32, 1364, [3:3] -belowEpsilon = bits, U32, 1364, [4:4] -tooShort = bits, U32, 1364, [5:5] -fractionalInjFuel = scalar, F32, 1368, "", 1, 0 -accumulatedValue = scalar, F32, 1372, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1376, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1380, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1384, "", 1, 0 -cycleCnt = scalar, S32, 1388, "", 1, 0 -; total TS size = 1392 -hwEventCounters1 = scalar, U16, 1392, "", 1, 0 -hwEventCounters2 = scalar, U16, 1394, "", 1, 0 -hwEventCounters3 = scalar, U16, 1396, "", 1, 0 -hwEventCounters4 = scalar, U16, 1398, "", 1, 0 -vvtCamCounter = scalar, U16, 1400, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1404, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1408, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1412, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1413, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1416, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1420, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1424, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1428, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1432, [0:0] -triggerElapsedUs = scalar, U32, 1436, "", 1, 0 -; total TS size = 1440 -trgsynchronizationCounter = scalar, U32, 1440, "", 1, 0 -trgvvtToothDurations0 = scalar, U32, 1444, "us", 1, 0 -trgvvtCurrentPosition = scalar, F32, 1448, "", 1, 0 -trgvvtToothPosition1 = scalar, F32, 1452, "", 1, 0 -trgvvtToothPosition2 = scalar, F32, 1456, "", 1, 0 -trgvvtToothPosition3 = scalar, F32, 1460, "", 1, 0 -trgvvtToothPosition4 = scalar, F32, 1464, "", 1, 0 -trgtriggerSyncGapRatio = scalar, F32, 1468, "", 1, 0 -trgtriggerStateIndex = scalar, U08, 1472, "", 1, 0 -; total TS size = 1476 -vvt1isynchronizationCounter = scalar, U32, 1476, "", 1, 0 -vvt1ivvtToothDurations0 = scalar, U32, 1480, "us", 1, 0 -vvt1ivvtCurrentPosition = scalar, F32, 1484, "", 1, 0 -vvt1ivvtToothPosition1 = scalar, F32, 1488, "", 1, 0 -vvt1ivvtToothPosition2 = scalar, F32, 1492, "", 1, 0 -vvt1ivvtToothPosition3 = scalar, F32, 1496, "", 1, 0 -vvt1ivvtToothPosition4 = scalar, F32, 1500, "", 1, 0 -vvt1itriggerSyncGapRatio = scalar, F32, 1504, "", 1, 0 -vvt1itriggerStateIndex = scalar, U08, 1508, "", 1, 0 -; total TS size = 1512 -vvt1esynchronizationCounter = scalar, U32, 1512, "", 1, 0 -vvt1evvtToothDurations0 = scalar, U32, 1516, "us", 1, 0 -vvt1evvtCurrentPosition = scalar, F32, 1520, "", 1, 0 -vvt1evvtToothPosition1 = scalar, F32, 1524, "", 1, 0 -vvt1evvtToothPosition2 = scalar, F32, 1528, "", 1, 0 -vvt1evvtToothPosition3 = scalar, F32, 1532, "", 1, 0 -vvt1evvtToothPosition4 = scalar, F32, 1536, "", 1, 0 -vvt1etriggerSyncGapRatio = scalar, F32, 1540, "", 1, 0 -vvt1etriggerStateIndex = scalar, U08, 1544, "", 1, 0 -; total TS size = 1548 -vvt2isynchronizationCounter = scalar, U32, 1548, "", 1, 0 -vvt2ivvtToothDurations0 = scalar, U32, 1552, "us", 1, 0 -vvt2ivvtCurrentPosition = scalar, F32, 1556, "", 1, 0 -vvt2ivvtToothPosition1 = scalar, F32, 1560, "", 1, 0 -vvt2ivvtToothPosition2 = scalar, F32, 1564, "", 1, 0 -vvt2ivvtToothPosition3 = scalar, F32, 1568, "", 1, 0 -vvt2ivvtToothPosition4 = scalar, F32, 1572, "", 1, 0 -vvt2itriggerSyncGapRatio = scalar, F32, 1576, "", 1, 0 -vvt2itriggerStateIndex = scalar, U08, 1580, "", 1, 0 -; total TS size = 1584 -vvt2esynchronizationCounter = scalar, U32, 1584, "", 1, 0 -vvt2evvtToothDurations0 = scalar, U32, 1588, "us", 1, 0 -vvt2evvtCurrentPosition = scalar, F32, 1592, "", 1, 0 -vvt2evvtToothPosition1 = scalar, F32, 1596, "", 1, 0 -vvt2evvtToothPosition2 = scalar, F32, 1600, "", 1, 0 -vvt2evvtToothPosition3 = scalar, F32, 1604, "", 1, 0 -vvt2evvtToothPosition4 = scalar, F32, 1608, "", 1, 0 -vvt2etriggerSyncGapRatio = scalar, F32, 1612, "", 1, 0 -vvt2etriggerStateIndex = scalar, U08, 1616, "", 1, 0 -; total TS size = 1620 -camResyncCounter = scalar, U08, 1620, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1624, [0:0] -; total TS size = 1628 -wallFuelCorrection = scalar, F32, 1628, "", 1, 0 -wallFuel = scalar, F32, 1632, "", 1, 0 -; total TS size = 1636 -idleState = bits, S32, 1636, [0:2], "not important" -baseIdlePosition = scalar, F32, 1640 -iacByTpsTaper = scalar, F32, 1644 -mightResetPid = bits, U32, 1648, [0:0] -shouldResetPid = bits, U32, 1648, [1:1] -wasResetPid = bits, U32, 1648, [2:2] -mustResetPid = bits, U32, 1648, [3:3] -isCranking = bits, U32, 1648, [4:4] -isIacTableForCoasting = bits, U32, 1648, [5:5] -notIdling = bits, U32, 1648, [6:6] -needReset = bits, U32, 1648, [7:7] -isInDeadZone = bits, U32, 1648, [8:8] -isBlipping = bits, U32, 1648, [9:9] -useClosedLoop = bits, U32, 1648, [10:10] -badTps = bits, U32, 1648, [11:11] -looksLikeRunning = bits, U32, 1648, [12:12] -looksLikeCoasting = bits, U32, 1648, [13:13] -looksLikeCrankToIdle = bits, U32, 1648, [14:14] -isIdleCoasting = bits, U32, 1648, [15:15] -isIdleClosedLoop = bits, U32, 1648, [16:16] -idleTarget = scalar, S32, 1652, "", 1, 0 -targetRpmByClt = scalar, S32, 1656, "", 1, 0 -targetRpmAc = scalar, S32, 1660, "", 1, 0 -iacByRpmTaper = scalar, F32, 1664 -luaAdd = scalar, F32, 1668 -idleClosedLoop = scalar, F32, 1672 -currentIdlePosition = scalar, F32, 1676 -idleTargetAirmass = scalar, U16, 1680, "mg", 1, 0 -idleTargetFlow = scalar, U16, 1682, "kg/h", 0.01, 0 -; total TS size = 1684 -etb1targetWithIdlePosition = scalar, F32, 1684, "%", 1,0 -etb1trim = scalar, F32, 1688, "", 1, 0 -etb1luaAdjustment = scalar, F32, 1692, "%", 1,0 -etb1m_wastegatePosition = scalar, F32, 1696, "%", 1,0 -etb1etbFeedForward = scalar, F32, 1700 -etb1etbCurrentTarget = scalar, F32, 1704, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1708, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1712, [0:0] -etb1jamDetected = bits, U32, 1712, [1:1] -etb1validPlantPosition = bits, U32, 1712, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1716, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1718, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1720, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1721, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1722, "%", 1, 0 -etb1jamTimer = scalar, U16, 1724, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1726, "%", 1, 0 -etb1state = scalar, U08, 1727, "", 1, 0 -; total TS size = 1728 -etb2targetWithIdlePosition = scalar, F32, 1728, "%", 1,0 -etb2trim = scalar, F32, 1732, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1736, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1740, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1744 -etb2etbCurrentTarget = scalar, F32, 1748, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1752, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1756, [0:0] -etb2jamDetected = bits, U32, 1756, [1:1] -etb2validPlantPosition = bits, U32, 1756, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1760, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1762, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1764, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1765, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1766, "%", 1, 0 -etb2jamTimer = scalar, U16, 1768, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1770, "%", 1, 0 -etb2state = scalar, U08, 1771, "", 1, 0 -; total TS size = 1772 -wb1faultCode = scalar, U08, 1772, "", 1, 0 -wb1heaterDuty = scalar, U08, 1773, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1774, "%", 1, 0 -wb1tempC = scalar, U16, 1776, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1778, "V", 0.001, 0 -wb1esr = scalar, U16, 1780, "ohm", 1, 0 -; total TS size = 1784 -wb2faultCode = scalar, U08, 1784, "", 1, 0 -wb2heaterDuty = scalar, U08, 1785, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1786, "%", 1, 0 -wb2tempC = scalar, U16, 1788, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1790, "V", 0.001, 0 -wb2esr = scalar, U16, 1792, "ohm", 1, 0 -; total TS size = 1796 -dcOutput0 = scalar, F32, 1796, "%", 1,0 -isEnabled0_int = scalar, U08, 1800, "%", 1,0 -isEnabled0 = bits, U32, 1804, [0:0] -; total TS size = 1808 -value0 = scalar, U16, 1808, "RAW", 1,0 -value1 = scalar, U16, 1810, "RAW", 1,0 -errorRate = scalar, F32, 1812, "% (don't belive me)", 1,0 -; total TS size = 1816 -vvtTarget = scalar, S16, 1816, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1818, "%", 0.5, 0 +currentVe = scalar, F32, 1308, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1312, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1316, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1320, "", 1, 0 +fuelInjectionCounter = scalar, U32, 1324, "", 1, 0 +globalSparkCounter = scalar, U32, 1328, "", 1, 0 +fuelingLoad = scalar, F32, 1332, "", 1, 0 +ignitionLoad = scalar, F32, 1336, "", 1, 0 +veTableYAxis = scalar, U16, 1340, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1342, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1343, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1344, "", 1, 0 +; total TS size = 1348 +tpsFrom = scalar, F32, 1348 +tpsTo = scalar, F32, 1352 +deltaTps = scalar, F32, 1356 +extraFuel = scalar, F32, 1360, "", 1, 0 +valueFromTable = scalar, F32, 1364, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1368, [0:0] +isBelowDecelThreshold = bits, U32, 1368, [1:1] +isTimeToResetAccumulator = bits, U32, 1368, [2:2] +isFractionalEnrichment = bits, U32, 1368, [3:3] +belowEpsilon = bits, U32, 1368, [4:4] +tooShort = bits, U32, 1368, [5:5] +fractionalInjFuel = scalar, F32, 1372, "", 1, 0 +accumulatedValue = scalar, F32, 1376, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1380, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1384, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1388, "", 1, 0 +cycleCnt = scalar, S32, 1392, "", 1, 0 +; total TS size = 1396 +hwEventCounters1 = scalar, U16, 1396, "", 1, 0 +hwEventCounters2 = scalar, U16, 1398, "", 1, 0 +hwEventCounters3 = scalar, U16, 1400, "", 1, 0 +hwEventCounters4 = scalar, U16, 1402, "", 1, 0 +vvtCamCounter = scalar, U16, 1404, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1408, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1412, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1416, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1417, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1420, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1424, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1428, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1432, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1436, [0:0] +triggerElapsedUs = scalar, U32, 1440, "", 1, 0 +; total TS size = 1444 +trgsynchronizationCounter = scalar, U32, 1444, "", 1, 0 +trgvvtToothDurations0 = scalar, U32, 1448, "us", 1, 0 +trgvvtCurrentPosition = scalar, F32, 1452, "", 1, 0 +trgvvtToothPosition1 = scalar, F32, 1456, "", 1, 0 +trgvvtToothPosition2 = scalar, F32, 1460, "", 1, 0 +trgvvtToothPosition3 = scalar, F32, 1464, "", 1, 0 +trgvvtToothPosition4 = scalar, F32, 1468, "", 1, 0 +trgtriggerSyncGapRatio = scalar, F32, 1472, "", 1, 0 +trgtriggerStateIndex = scalar, U08, 1476, "", 1, 0 +; total TS size = 1480 +vvt1isynchronizationCounter = scalar, U32, 1480, "", 1, 0 +vvt1ivvtToothDurations0 = scalar, U32, 1484, "us", 1, 0 +vvt1ivvtCurrentPosition = scalar, F32, 1488, "", 1, 0 +vvt1ivvtToothPosition1 = scalar, F32, 1492, "", 1, 0 +vvt1ivvtToothPosition2 = scalar, F32, 1496, "", 1, 0 +vvt1ivvtToothPosition3 = scalar, F32, 1500, "", 1, 0 +vvt1ivvtToothPosition4 = scalar, F32, 1504, "", 1, 0 +vvt1itriggerSyncGapRatio = scalar, F32, 1508, "", 1, 0 +vvt1itriggerStateIndex = scalar, U08, 1512, "", 1, 0 +; total TS size = 1516 +vvt1esynchronizationCounter = scalar, U32, 1516, "", 1, 0 +vvt1evvtToothDurations0 = scalar, U32, 1520, "us", 1, 0 +vvt1evvtCurrentPosition = scalar, F32, 1524, "", 1, 0 +vvt1evvtToothPosition1 = scalar, F32, 1528, "", 1, 0 +vvt1evvtToothPosition2 = scalar, F32, 1532, "", 1, 0 +vvt1evvtToothPosition3 = scalar, F32, 1536, "", 1, 0 +vvt1evvtToothPosition4 = scalar, F32, 1540, "", 1, 0 +vvt1etriggerSyncGapRatio = scalar, F32, 1544, "", 1, 0 +vvt1etriggerStateIndex = scalar, U08, 1548, "", 1, 0 +; total TS size = 1552 +vvt2isynchronizationCounter = scalar, U32, 1552, "", 1, 0 +vvt2ivvtToothDurations0 = scalar, U32, 1556, "us", 1, 0 +vvt2ivvtCurrentPosition = scalar, F32, 1560, "", 1, 0 +vvt2ivvtToothPosition1 = scalar, F32, 1564, "", 1, 0 +vvt2ivvtToothPosition2 = scalar, F32, 1568, "", 1, 0 +vvt2ivvtToothPosition3 = scalar, F32, 1572, "", 1, 0 +vvt2ivvtToothPosition4 = scalar, F32, 1576, "", 1, 0 +vvt2itriggerSyncGapRatio = scalar, F32, 1580, "", 1, 0 +vvt2itriggerStateIndex = scalar, U08, 1584, "", 1, 0 +; total TS size = 1588 +vvt2esynchronizationCounter = scalar, U32, 1588, "", 1, 0 +vvt2evvtToothDurations0 = scalar, U32, 1592, "us", 1, 0 +vvt2evvtCurrentPosition = scalar, F32, 1596, "", 1, 0 +vvt2evvtToothPosition1 = scalar, F32, 1600, "", 1, 0 +vvt2evvtToothPosition2 = scalar, F32, 1604, "", 1, 0 +vvt2evvtToothPosition3 = scalar, F32, 1608, "", 1, 0 +vvt2evvtToothPosition4 = scalar, F32, 1612, "", 1, 0 +vvt2etriggerSyncGapRatio = scalar, F32, 1616, "", 1, 0 +vvt2etriggerStateIndex = scalar, U08, 1620, "", 1, 0 +; total TS size = 1624 +camResyncCounter = scalar, U08, 1624, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1628, [0:0] +; total TS size = 1632 +wallFuelCorrection = scalar, F32, 1632, "", 1, 0 +wallFuel = scalar, F32, 1636, "", 1, 0 +; total TS size = 1640 +idleState = bits, S32, 1640, [0:2], "not important" +baseIdlePosition = scalar, F32, 1644 +iacByTpsTaper = scalar, F32, 1648 +mightResetPid = bits, U32, 1652, [0:0] +shouldResetPid = bits, U32, 1652, [1:1] +wasResetPid = bits, U32, 1652, [2:2] +mustResetPid = bits, U32, 1652, [3:3] +isCranking = bits, U32, 1652, [4:4] +isIacTableForCoasting = bits, U32, 1652, [5:5] +notIdling = bits, U32, 1652, [6:6] +needReset = bits, U32, 1652, [7:7] +isInDeadZone = bits, U32, 1652, [8:8] +isBlipping = bits, U32, 1652, [9:9] +useClosedLoop = bits, U32, 1652, [10:10] +badTps = bits, U32, 1652, [11:11] +looksLikeRunning = bits, U32, 1652, [12:12] +looksLikeCoasting = bits, U32, 1652, [13:13] +looksLikeCrankToIdle = bits, U32, 1652, [14:14] +isIdleCoasting = bits, U32, 1652, [15:15] +isIdleClosedLoop = bits, U32, 1652, [16:16] +idleTarget = scalar, S32, 1656, "", 1, 0 +targetRpmByClt = scalar, S32, 1660, "", 1, 0 +targetRpmAc = scalar, S32, 1664, "", 1, 0 +iacByRpmTaper = scalar, F32, 1668 +luaAdd = scalar, F32, 1672 +idleClosedLoop = scalar, F32, 1676 +currentIdlePosition = scalar, F32, 1680 +idleTargetAirmass = scalar, U16, 1684, "mg", 1, 0 +idleTargetFlow = scalar, U16, 1686, "kg/h", 0.01, 0 +; total TS size = 1688 +etb1targetWithIdlePosition = scalar, F32, 1688, "%", 1,0 +etb1trim = scalar, F32, 1692, "", 1, 0 +etb1luaAdjustment = scalar, F32, 1696, "%", 1,0 +etb1m_wastegatePosition = scalar, F32, 1700, "%", 1,0 +etb1etbFeedForward = scalar, F32, 1704 +etb1etbCurrentTarget = scalar, F32, 1708, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1712, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1716, [0:0] +etb1jamDetected = bits, U32, 1716, [1:1] +etb1validPlantPosition = bits, U32, 1716, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1720, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1722, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1724, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1725, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1726, "%", 1, 0 +etb1jamTimer = scalar, U16, 1728, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1730, "%", 1, 0 +etb1state = scalar, U08, 1731, "", 1, 0 +; total TS size = 1732 +etb2targetWithIdlePosition = scalar, F32, 1732, "%", 1,0 +etb2trim = scalar, F32, 1736, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1740, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1744, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1748 +etb2etbCurrentTarget = scalar, F32, 1752, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1756, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1760, [0:0] +etb2jamDetected = bits, U32, 1760, [1:1] +etb2validPlantPosition = bits, U32, 1760, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1764, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1766, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1768, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1769, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1770, "%", 1, 0 +etb2jamTimer = scalar, U16, 1772, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1774, "%", 1, 0 +etb2state = scalar, U08, 1775, "", 1, 0 +; total TS size = 1776 +wb1faultCode = scalar, U08, 1776, "", 1, 0 +wb1heaterDuty = scalar, U08, 1777, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1778, "%", 1, 0 +wb1tempC = scalar, U16, 1780, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1782, "V", 0.001, 0 +wb1esr = scalar, U16, 1784, "ohm", 1, 0 +; total TS size = 1788 +wb2faultCode = scalar, U08, 1788, "", 1, 0 +wb2heaterDuty = scalar, U08, 1789, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1790, "%", 1, 0 +wb2tempC = scalar, U16, 1792, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1794, "V", 0.001, 0 +wb2esr = scalar, U16, 1796, "ohm", 1, 0 +; total TS size = 1800 +dcOutput0 = scalar, F32, 1800, "%", 1,0 +isEnabled0_int = scalar, U08, 1804, "%", 1,0 +isEnabled0 = bits, U32, 1808, [0:0] +; total TS size = 1812 +value0 = scalar, U16, 1812, "RAW", 1,0 +value1 = scalar, U16, 1814, "RAW", 1,0 +errorRate = scalar, F32, 1816, "% (don't belive me)", 1,0 ; total TS size = 1820 -lambdaCurrentlyGood = bits, U32, 1820, [0:0] -lambdaMonitorCut = bits, U32, 1820, [1:1] -lambdaTimeSinceGood = scalar, U16, 1824, "sec", 0.01, 0 -; total TS size = 1828 +vvtTarget = scalar, S16, 1820, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1822, "%", 0.5, 0 +; total TS size = 1824 +lambdaCurrentlyGood = bits, U32, 1824, [0:0] +lambdaMonitorCut = bits, U32, 1824, [1:1] +lambdaTimeSinceGood = scalar, U16, 1828, "sec", 0.01, 0 +; total TS size = 1832 diff --git a/generated/console/binary/generated/live_data_ids.h b/generated/console/binary/generated/live_data_ids.h index a2226bd..3a6403a 100644 --- a/generated/console/binary/generated/live_data_ids.h +++ b/generated/console/binary/generated/live_data_ids.h @@ -61,15 +61,15 @@ LDS_lambda_monitor, #define FUEL_PUMP_CONTROL_BASE_ADDRESS 1244 #define MAIN_RELAY_BASE_ADDRESS 1248 #define ENGINE_STATE_BASE_ADDRESS 1252 -#define TPS_ACCEL_STATE_BASE_ADDRESS 1344 -#define TRIGGER_CENTRAL_BASE_ADDRESS 1392 -#define TRIGGER_STATE_BASE_ADDRESS 1440 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1620 -#define WALL_FUEL_STATE_BASE_ADDRESS 1628 -#define IDLE_STATE_BASE_ADDRESS 1636 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1684 -#define WIDEBAND_STATE_BASE_ADDRESS 1772 -#define DC_MOTORS_BASE_ADDRESS 1796 -#define SENT_STATE_BASE_ADDRESS 1808 -#define VVT_BASE_ADDRESS 1816 -#define LAMBDA_MONITOR_BASE_ADDRESS 1820 +#define TPS_ACCEL_STATE_BASE_ADDRESS 1348 +#define TRIGGER_CENTRAL_BASE_ADDRESS 1396 +#define TRIGGER_STATE_BASE_ADDRESS 1444 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1624 +#define WALL_FUEL_STATE_BASE_ADDRESS 1632 +#define IDLE_STATE_BASE_ADDRESS 1640 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1688 +#define WIDEBAND_STATE_BASE_ADDRESS 1776 +#define DC_MOTORS_BASE_ADDRESS 1800 +#define SENT_STATE_BASE_ADDRESS 1812 +#define VVT_BASE_ADDRESS 1820 +#define LAMBDA_MONITOR_BASE_ADDRESS 1824 diff --git a/generated/console/binary/generated/total_live_data_generated.h b/generated/console/binary/generated/total_live_data_generated.h index 1eac838..654c79e 100644 --- a/generated/console/binary/generated/total_live_data_generated.h +++ b/generated/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 1828 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1832 \ No newline at end of file diff --git a/generated/console/binary_log/log_fields_generated.h b/generated/console/binary_log/log_fields_generated.h index 6ca5a19..aec83ee 100644 --- a/generated/console/binary_log/log_fields_generated.h +++ b/generated/console/binary_log/log_fields_generated.h @@ -733,6 +733,7 @@ static const LogField fields[] = { {engine->engineState, 48, 7, "luaDigitalState3", ""}, {engine->engineState, 48, 8, "Clutch: down", ""}, {engine->engineState.startStopStateToggleCounter, "startStopStateToggleCounter", "", 0}, + {engine->engineState.currentVe, "currentVe", "", 0}, {engine->engineState.luaSoftSparkSkip, "luaSoftSparkSkip", "", 0}, {engine->engineState.luaHardSparkSkip, "luaHardSparkSkip", "", 0}, {engine->engineState.tractionControlSparkSkip, "tractionControlSparkSkip", "", 0}, diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index dea82e4..6ab76c4 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -1383,7 +1383,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1441948249 +#define SIGNATURE_HASH 4008549961 #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" @@ -1882,14 +1882,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 main.2025.04.01.XYZ.1441948249" +#define TS_SIGNATURE "rusEFI main.2025.04.02.XYZ.4008549961" #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 1828 +#define TS_TOTAL_OUTPUT_SIZE 1832 #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/generated/controllers/generated/signature_XYZ.h b/generated/controllers/generated/signature_XYZ.h index c610ab3..6fb775f 100644 --- a/generated/controllers/generated/signature_XYZ.h +++ b/generated/controllers/generated/signature_XYZ.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 1441948249 -#define TS_SIGNATURE "rusEFI main.2025.04.01.XYZ.1441948249" +#define SIGNATURE_HASH 4008549961 +#define TS_SIGNATURE "rusEFI main.2025.04.02.XYZ.4008549961" diff --git a/generated/live_data_generated/engine_state_generated.h b/generated/live_data_generated/engine_state_generated.h index 56afbb2..f546439 100644 --- a/generated/live_data_generated/engine_state_generated.h +++ b/generated/live_data_generated/engine_state_generated.h @@ -325,60 +325,64 @@ struct engine_state_s { /** * offset 56 */ - float luaSoftSparkSkip = (float)0; + float currentVe = (float)0; /** * offset 60 */ - float luaHardSparkSkip = (float)0; + float luaSoftSparkSkip = (float)0; /** * offset 64 */ + float luaHardSparkSkip = (float)0; + /** + * offset 68 + */ float tractionControlSparkSkip = (float)0; /** * Fuel: Injection counter - * offset 68 + * offset 72 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** * Ign: Spark counter - * offset 72 + * offset 76 */ uint32_t globalSparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 76 + * offset 80 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 80 + * offset 84 */ float ignitionLoad = (float)0; /** * units: % - * offset 84 + * offset 88 */ scaled_channel veTableYAxis = (uint16_t)0; /** - * offset 86 + * offset 90 */ uint8_t overDwellCounter = (uint8_t)0; /** - * offset 87 + * offset 91 */ uint8_t overDwellNotScheduledCounter = (uint8_t)0; /** - * offset 88 + * offset 92 */ uint8_t sparkOutOfOrderCounter = (uint8_t)0; /** * need 4 byte alignment * units: units - * offset 89 + * offset 93 */ - uint8_t alignmentFill_at_89[3] = {}; + uint8_t alignmentFill_at_93[3] = {}; }; -static_assert(sizeof(engine_state_s) == 92); +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/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index da7c527..7361bbd 100644 --- a/generated/tunerstudio/generated/rusefi_XYZ.ini +++ b/generated/tunerstudio/generated/rusefi_XYZ.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2025.04.01.XYZ.1441948249" + signature = "rusEFI main.2025.04.02.XYZ.4008549961" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2025.04.01.XYZ.1441948249" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2025.04.02.XYZ.4008549961" ; 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 @@ -2703,7 +2703,7 @@ maximumOilPressureValues = array, U08, 24164, [4], "kPa", 10.0, 0, 0, 2000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1828 + ochBlockSize = 1832 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3448,205 +3448,206 @@ luaDigitalState2 = bits, U32, 1300, [6:6] luaDigitalState3 = bits, U32, 1300, [7:7] clutchDownState = bits, U32, 1300, [8:8] startStopStateToggleCounter = scalar, U32, 1304, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1308, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1312, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1316, "", 1, 0 -fuelInjectionCounter = scalar, U32, 1320, "", 1, 0 -globalSparkCounter = scalar, U32, 1324, "", 1, 0 -fuelingLoad = scalar, F32, 1328, "", 1, 0 -ignitionLoad = scalar, F32, 1332, "", 1, 0 -veTableYAxis = scalar, U16, 1336, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1338, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1339, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1340, "", 1, 0 -; total TS size = 1344 -tpsFrom = scalar, F32, 1344 -tpsTo = scalar, F32, 1348 -deltaTps = scalar, F32, 1352 -extraFuel = scalar, F32, 1356, "", 1, 0 -valueFromTable = scalar, F32, 1360, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1364, [0:0] -isBelowDecelThreshold = bits, U32, 1364, [1:1] -isTimeToResetAccumulator = bits, U32, 1364, [2:2] -isFractionalEnrichment = bits, U32, 1364, [3:3] -belowEpsilon = bits, U32, 1364, [4:4] -tooShort = bits, U32, 1364, [5:5] -fractionalInjFuel = scalar, F32, 1368, "", 1, 0 -accumulatedValue = scalar, F32, 1372, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1376, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1380, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1384, "", 1, 0 -cycleCnt = scalar, S32, 1388, "", 1, 0 -; total TS size = 1392 -hwEventCounters1 = scalar, U16, 1392, "", 1, 0 -hwEventCounters2 = scalar, U16, 1394, "", 1, 0 -hwEventCounters3 = scalar, U16, 1396, "", 1, 0 -hwEventCounters4 = scalar, U16, 1398, "", 1, 0 -vvtCamCounter = scalar, U16, 1400, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1404, "kPa", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1408, "kPa", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1412, "distance", 1, 0 -mapVvt_sync_counter = scalar, U08, 1413, "counter", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1416, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1420, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1424, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1428, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1432, [0:0] -triggerElapsedUs = scalar, U32, 1436, "", 1, 0 -; total TS size = 1440 -trgsynchronizationCounter = scalar, U32, 1440, "", 1, 0 -trgvvtToothDurations0 = scalar, U32, 1444, "us", 1, 0 -trgvvtCurrentPosition = scalar, F32, 1448, "", 1, 0 -trgvvtToothPosition1 = scalar, F32, 1452, "", 1, 0 -trgvvtToothPosition2 = scalar, F32, 1456, "", 1, 0 -trgvvtToothPosition3 = scalar, F32, 1460, "", 1, 0 -trgvvtToothPosition4 = scalar, F32, 1464, "", 1, 0 -trgtriggerSyncGapRatio = scalar, F32, 1468, "", 1, 0 -trgtriggerStateIndex = scalar, U08, 1472, "", 1, 0 -; total TS size = 1476 -vvt1isynchronizationCounter = scalar, U32, 1476, "", 1, 0 -vvt1ivvtToothDurations0 = scalar, U32, 1480, "us", 1, 0 -vvt1ivvtCurrentPosition = scalar, F32, 1484, "", 1, 0 -vvt1ivvtToothPosition1 = scalar, F32, 1488, "", 1, 0 -vvt1ivvtToothPosition2 = scalar, F32, 1492, "", 1, 0 -vvt1ivvtToothPosition3 = scalar, F32, 1496, "", 1, 0 -vvt1ivvtToothPosition4 = scalar, F32, 1500, "", 1, 0 -vvt1itriggerSyncGapRatio = scalar, F32, 1504, "", 1, 0 -vvt1itriggerStateIndex = scalar, U08, 1508, "", 1, 0 -; total TS size = 1512 -vvt1esynchronizationCounter = scalar, U32, 1512, "", 1, 0 -vvt1evvtToothDurations0 = scalar, U32, 1516, "us", 1, 0 -vvt1evvtCurrentPosition = scalar, F32, 1520, "", 1, 0 -vvt1evvtToothPosition1 = scalar, F32, 1524, "", 1, 0 -vvt1evvtToothPosition2 = scalar, F32, 1528, "", 1, 0 -vvt1evvtToothPosition3 = scalar, F32, 1532, "", 1, 0 -vvt1evvtToothPosition4 = scalar, F32, 1536, "", 1, 0 -vvt1etriggerSyncGapRatio = scalar, F32, 1540, "", 1, 0 -vvt1etriggerStateIndex = scalar, U08, 1544, "", 1, 0 -; total TS size = 1548 -vvt2isynchronizationCounter = scalar, U32, 1548, "", 1, 0 -vvt2ivvtToothDurations0 = scalar, U32, 1552, "us", 1, 0 -vvt2ivvtCurrentPosition = scalar, F32, 1556, "", 1, 0 -vvt2ivvtToothPosition1 = scalar, F32, 1560, "", 1, 0 -vvt2ivvtToothPosition2 = scalar, F32, 1564, "", 1, 0 -vvt2ivvtToothPosition3 = scalar, F32, 1568, "", 1, 0 -vvt2ivvtToothPosition4 = scalar, F32, 1572, "", 1, 0 -vvt2itriggerSyncGapRatio = scalar, F32, 1576, "", 1, 0 -vvt2itriggerStateIndex = scalar, U08, 1580, "", 1, 0 -; total TS size = 1584 -vvt2esynchronizationCounter = scalar, U32, 1584, "", 1, 0 -vvt2evvtToothDurations0 = scalar, U32, 1588, "us", 1, 0 -vvt2evvtCurrentPosition = scalar, F32, 1592, "", 1, 0 -vvt2evvtToothPosition1 = scalar, F32, 1596, "", 1, 0 -vvt2evvtToothPosition2 = scalar, F32, 1600, "", 1, 0 -vvt2evvtToothPosition3 = scalar, F32, 1604, "", 1, 0 -vvt2evvtToothPosition4 = scalar, F32, 1608, "", 1, 0 -vvt2etriggerSyncGapRatio = scalar, F32, 1612, "", 1, 0 -vvt2etriggerStateIndex = scalar, U08, 1616, "", 1, 0 -; total TS size = 1620 -camResyncCounter = scalar, U08, 1620, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1624, [0:0] -; total TS size = 1628 -wallFuelCorrection = scalar, F32, 1628, "", 1, 0 -wallFuel = scalar, F32, 1632, "", 1, 0 -; total TS size = 1636 -idleState = bits, S32, 1636, [0:2], "not important" -baseIdlePosition = scalar, F32, 1640 -iacByTpsTaper = scalar, F32, 1644 -mightResetPid = bits, U32, 1648, [0:0] -shouldResetPid = bits, U32, 1648, [1:1] -wasResetPid = bits, U32, 1648, [2:2] -mustResetPid = bits, U32, 1648, [3:3] -isCranking = bits, U32, 1648, [4:4] -isIacTableForCoasting = bits, U32, 1648, [5:5] -notIdling = bits, U32, 1648, [6:6] -needReset = bits, U32, 1648, [7:7] -isInDeadZone = bits, U32, 1648, [8:8] -isBlipping = bits, U32, 1648, [9:9] -useClosedLoop = bits, U32, 1648, [10:10] -badTps = bits, U32, 1648, [11:11] -looksLikeRunning = bits, U32, 1648, [12:12] -looksLikeCoasting = bits, U32, 1648, [13:13] -looksLikeCrankToIdle = bits, U32, 1648, [14:14] -isIdleCoasting = bits, U32, 1648, [15:15] -isIdleClosedLoop = bits, U32, 1648, [16:16] -idleTarget = scalar, S32, 1652, "", 1, 0 -targetRpmByClt = scalar, S32, 1656, "", 1, 0 -targetRpmAc = scalar, S32, 1660, "", 1, 0 -iacByRpmTaper = scalar, F32, 1664 -luaAdd = scalar, F32, 1668 -idleClosedLoop = scalar, F32, 1672 -currentIdlePosition = scalar, F32, 1676 -idleTargetAirmass = scalar, U16, 1680, "mg", 1, 0 -idleTargetFlow = scalar, U16, 1682, "kg/h", 0.01, 0 -; total TS size = 1684 -etb1targetWithIdlePosition = scalar, F32, 1684, "%", 1,0 -etb1trim = scalar, F32, 1688, "", 1, 0 -etb1luaAdjustment = scalar, F32, 1692, "%", 1,0 -etb1m_wastegatePosition = scalar, F32, 1696, "%", 1,0 -etb1etbFeedForward = scalar, F32, 1700 -etb1etbCurrentTarget = scalar, F32, 1704, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1708, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1712, [0:0] -etb1jamDetected = bits, U32, 1712, [1:1] -etb1validPlantPosition = bits, U32, 1712, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1716, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1718, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1720, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1721, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1722, "%", 1, 0 -etb1jamTimer = scalar, U16, 1724, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1726, "%", 1, 0 -etb1state = scalar, U08, 1727, "", 1, 0 -; total TS size = 1728 -etb2targetWithIdlePosition = scalar, F32, 1728, "%", 1,0 -etb2trim = scalar, F32, 1732, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1736, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1740, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1744 -etb2etbCurrentTarget = scalar, F32, 1748, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1752, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1756, [0:0] -etb2jamDetected = bits, U32, 1756, [1:1] -etb2validPlantPosition = bits, U32, 1756, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1760, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1762, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1764, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1765, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1766, "%", 1, 0 -etb2jamTimer = scalar, U16, 1768, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1770, "%", 1, 0 -etb2state = scalar, U08, 1771, "", 1, 0 -; total TS size = 1772 -wb1faultCode = scalar, U08, 1772, "", 1, 0 -wb1heaterDuty = scalar, U08, 1773, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1774, "%", 1, 0 -wb1tempC = scalar, U16, 1776, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1778, "V", 0.001, 0 -wb1esr = scalar, U16, 1780, "ohm", 1, 0 -; total TS size = 1784 -wb2faultCode = scalar, U08, 1784, "", 1, 0 -wb2heaterDuty = scalar, U08, 1785, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1786, "%", 1, 0 -wb2tempC = scalar, U16, 1788, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1790, "V", 0.001, 0 -wb2esr = scalar, U16, 1792, "ohm", 1, 0 -; total TS size = 1796 -dcOutput0 = scalar, F32, 1796, "%", 1,0 -isEnabled0_int = scalar, U08, 1800, "%", 1,0 -isEnabled0 = bits, U32, 1804, [0:0] -; total TS size = 1808 -value0 = scalar, U16, 1808, "RAW", 1,0 -value1 = scalar, U16, 1810, "RAW", 1,0 -errorRate = scalar, F32, 1812, "% (don't belive me)", 1,0 -; total TS size = 1816 -vvtTarget = scalar, S16, 1816, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1818, "%", 0.5, 0 +currentVe = scalar, F32, 1308, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1312, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1316, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1320, "", 1, 0 +fuelInjectionCounter = scalar, U32, 1324, "", 1, 0 +globalSparkCounter = scalar, U32, 1328, "", 1, 0 +fuelingLoad = scalar, F32, 1332, "", 1, 0 +ignitionLoad = scalar, F32, 1336, "", 1, 0 +veTableYAxis = scalar, U16, 1340, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1342, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1343, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1344, "", 1, 0 +; total TS size = 1348 +tpsFrom = scalar, F32, 1348 +tpsTo = scalar, F32, 1352 +deltaTps = scalar, F32, 1356 +extraFuel = scalar, F32, 1360, "", 1, 0 +valueFromTable = scalar, F32, 1364, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1368, [0:0] +isBelowDecelThreshold = bits, U32, 1368, [1:1] +isTimeToResetAccumulator = bits, U32, 1368, [2:2] +isFractionalEnrichment = bits, U32, 1368, [3:3] +belowEpsilon = bits, U32, 1368, [4:4] +tooShort = bits, U32, 1368, [5:5] +fractionalInjFuel = scalar, F32, 1372, "", 1, 0 +accumulatedValue = scalar, F32, 1376, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1380, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1384, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1388, "", 1, 0 +cycleCnt = scalar, S32, 1392, "", 1, 0 +; total TS size = 1396 +hwEventCounters1 = scalar, U16, 1396, "", 1, 0 +hwEventCounters2 = scalar, U16, 1398, "", 1, 0 +hwEventCounters3 = scalar, U16, 1400, "", 1, 0 +hwEventCounters4 = scalar, U16, 1402, "", 1, 0 +vvtCamCounter = scalar, U16, 1404, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1408, "kPa", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1412, "kPa", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1416, "distance", 1, 0 +mapVvt_sync_counter = scalar, U08, 1417, "counter", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1420, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1424, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1428, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1432, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1436, [0:0] +triggerElapsedUs = scalar, U32, 1440, "", 1, 0 +; total TS size = 1444 +trgsynchronizationCounter = scalar, U32, 1444, "", 1, 0 +trgvvtToothDurations0 = scalar, U32, 1448, "us", 1, 0 +trgvvtCurrentPosition = scalar, F32, 1452, "", 1, 0 +trgvvtToothPosition1 = scalar, F32, 1456, "", 1, 0 +trgvvtToothPosition2 = scalar, F32, 1460, "", 1, 0 +trgvvtToothPosition3 = scalar, F32, 1464, "", 1, 0 +trgvvtToothPosition4 = scalar, F32, 1468, "", 1, 0 +trgtriggerSyncGapRatio = scalar, F32, 1472, "", 1, 0 +trgtriggerStateIndex = scalar, U08, 1476, "", 1, 0 +; total TS size = 1480 +vvt1isynchronizationCounter = scalar, U32, 1480, "", 1, 0 +vvt1ivvtToothDurations0 = scalar, U32, 1484, "us", 1, 0 +vvt1ivvtCurrentPosition = scalar, F32, 1488, "", 1, 0 +vvt1ivvtToothPosition1 = scalar, F32, 1492, "", 1, 0 +vvt1ivvtToothPosition2 = scalar, F32, 1496, "", 1, 0 +vvt1ivvtToothPosition3 = scalar, F32, 1500, "", 1, 0 +vvt1ivvtToothPosition4 = scalar, F32, 1504, "", 1, 0 +vvt1itriggerSyncGapRatio = scalar, F32, 1508, "", 1, 0 +vvt1itriggerStateIndex = scalar, U08, 1512, "", 1, 0 +; total TS size = 1516 +vvt1esynchronizationCounter = scalar, U32, 1516, "", 1, 0 +vvt1evvtToothDurations0 = scalar, U32, 1520, "us", 1, 0 +vvt1evvtCurrentPosition = scalar, F32, 1524, "", 1, 0 +vvt1evvtToothPosition1 = scalar, F32, 1528, "", 1, 0 +vvt1evvtToothPosition2 = scalar, F32, 1532, "", 1, 0 +vvt1evvtToothPosition3 = scalar, F32, 1536, "", 1, 0 +vvt1evvtToothPosition4 = scalar, F32, 1540, "", 1, 0 +vvt1etriggerSyncGapRatio = scalar, F32, 1544, "", 1, 0 +vvt1etriggerStateIndex = scalar, U08, 1548, "", 1, 0 +; total TS size = 1552 +vvt2isynchronizationCounter = scalar, U32, 1552, "", 1, 0 +vvt2ivvtToothDurations0 = scalar, U32, 1556, "us", 1, 0 +vvt2ivvtCurrentPosition = scalar, F32, 1560, "", 1, 0 +vvt2ivvtToothPosition1 = scalar, F32, 1564, "", 1, 0 +vvt2ivvtToothPosition2 = scalar, F32, 1568, "", 1, 0 +vvt2ivvtToothPosition3 = scalar, F32, 1572, "", 1, 0 +vvt2ivvtToothPosition4 = scalar, F32, 1576, "", 1, 0 +vvt2itriggerSyncGapRatio = scalar, F32, 1580, "", 1, 0 +vvt2itriggerStateIndex = scalar, U08, 1584, "", 1, 0 +; total TS size = 1588 +vvt2esynchronizationCounter = scalar, U32, 1588, "", 1, 0 +vvt2evvtToothDurations0 = scalar, U32, 1592, "us", 1, 0 +vvt2evvtCurrentPosition = scalar, F32, 1596, "", 1, 0 +vvt2evvtToothPosition1 = scalar, F32, 1600, "", 1, 0 +vvt2evvtToothPosition2 = scalar, F32, 1604, "", 1, 0 +vvt2evvtToothPosition3 = scalar, F32, 1608, "", 1, 0 +vvt2evvtToothPosition4 = scalar, F32, 1612, "", 1, 0 +vvt2etriggerSyncGapRatio = scalar, F32, 1616, "", 1, 0 +vvt2etriggerStateIndex = scalar, U08, 1620, "", 1, 0 +; total TS size = 1624 +camResyncCounter = scalar, U08, 1624, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1628, [0:0] +; total TS size = 1632 +wallFuelCorrection = scalar, F32, 1632, "", 1, 0 +wallFuel = scalar, F32, 1636, "", 1, 0 +; total TS size = 1640 +idleState = bits, S32, 1640, [0:2], "not important" +baseIdlePosition = scalar, F32, 1644 +iacByTpsTaper = scalar, F32, 1648 +mightResetPid = bits, U32, 1652, [0:0] +shouldResetPid = bits, U32, 1652, [1:1] +wasResetPid = bits, U32, 1652, [2:2] +mustResetPid = bits, U32, 1652, [3:3] +isCranking = bits, U32, 1652, [4:4] +isIacTableForCoasting = bits, U32, 1652, [5:5] +notIdling = bits, U32, 1652, [6:6] +needReset = bits, U32, 1652, [7:7] +isInDeadZone = bits, U32, 1652, [8:8] +isBlipping = bits, U32, 1652, [9:9] +useClosedLoop = bits, U32, 1652, [10:10] +badTps = bits, U32, 1652, [11:11] +looksLikeRunning = bits, U32, 1652, [12:12] +looksLikeCoasting = bits, U32, 1652, [13:13] +looksLikeCrankToIdle = bits, U32, 1652, [14:14] +isIdleCoasting = bits, U32, 1652, [15:15] +isIdleClosedLoop = bits, U32, 1652, [16:16] +idleTarget = scalar, S32, 1656, "", 1, 0 +targetRpmByClt = scalar, S32, 1660, "", 1, 0 +targetRpmAc = scalar, S32, 1664, "", 1, 0 +iacByRpmTaper = scalar, F32, 1668 +luaAdd = scalar, F32, 1672 +idleClosedLoop = scalar, F32, 1676 +currentIdlePosition = scalar, F32, 1680 +idleTargetAirmass = scalar, U16, 1684, "mg", 1, 0 +idleTargetFlow = scalar, U16, 1686, "kg/h", 0.01, 0 +; total TS size = 1688 +etb1targetWithIdlePosition = scalar, F32, 1688, "%", 1,0 +etb1trim = scalar, F32, 1692, "", 1, 0 +etb1luaAdjustment = scalar, F32, 1696, "%", 1,0 +etb1m_wastegatePosition = scalar, F32, 1700, "%", 1,0 +etb1etbFeedForward = scalar, F32, 1704 +etb1etbCurrentTarget = scalar, F32, 1708, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1712, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1716, [0:0] +etb1jamDetected = bits, U32, 1716, [1:1] +etb1validPlantPosition = bits, U32, 1716, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1720, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1722, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1724, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1725, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1726, "%", 1, 0 +etb1jamTimer = scalar, U16, 1728, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1730, "%", 1, 0 +etb1state = scalar, U08, 1731, "", 1, 0 +; total TS size = 1732 +etb2targetWithIdlePosition = scalar, F32, 1732, "%", 1,0 +etb2trim = scalar, F32, 1736, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1740, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1744, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1748 +etb2etbCurrentTarget = scalar, F32, 1752, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1756, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1760, [0:0] +etb2jamDetected = bits, U32, 1760, [1:1] +etb2validPlantPosition = bits, U32, 1760, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1764, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1766, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1768, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1769, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1770, "%", 1, 0 +etb2jamTimer = scalar, U16, 1772, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1774, "%", 1, 0 +etb2state = scalar, U08, 1775, "", 1, 0 +; total TS size = 1776 +wb1faultCode = scalar, U08, 1776, "", 1, 0 +wb1heaterDuty = scalar, U08, 1777, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1778, "%", 1, 0 +wb1tempC = scalar, U16, 1780, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1782, "V", 0.001, 0 +wb1esr = scalar, U16, 1784, "ohm", 1, 0 +; total TS size = 1788 +wb2faultCode = scalar, U08, 1788, "", 1, 0 +wb2heaterDuty = scalar, U08, 1789, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1790, "%", 1, 0 +wb2tempC = scalar, U16, 1792, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1794, "V", 0.001, 0 +wb2esr = scalar, U16, 1796, "ohm", 1, 0 +; total TS size = 1800 +dcOutput0 = scalar, F32, 1800, "%", 1,0 +isEnabled0_int = scalar, U08, 1804, "%", 1,0 +isEnabled0 = bits, U32, 1808, [0:0] +; total TS size = 1812 +value0 = scalar, U16, 1812, "RAW", 1,0 +value1 = scalar, U16, 1814, "RAW", 1,0 +errorRate = scalar, F32, 1816, "% (don't belive me)", 1,0 ; total TS size = 1820 -lambdaCurrentlyGood = bits, U32, 1820, [0:0] -lambdaMonitorCut = bits, U32, 1820, [1:1] -lambdaTimeSinceGood = scalar, U16, 1824, "sec", 0.01, 0 -; total TS size = 1828 +vvtTarget = scalar, S16, 1820, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1822, "%", 0.5, 0 +; total TS size = 1824 +lambdaCurrentlyGood = bits, U32, 1824, [0:0] +lambdaMonitorCut = bits, U32, 1824, [1:1] +lambdaTimeSinceGood = scalar, U16, 1828, "sec", 0.01, 0 +; total TS size = 1832 time = { timeNow } @@ -6108,6 +6109,7 @@ entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = clutchDownState, "Clutch: down", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" +entry = currentVe, "currentVe", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -7175,18 +7177,20 @@ dialog = engine_stateDialog, "engine_state" graphLine = smartChipAliveCounter liveGraph = engine_state_5_Graph, "Graph", South graphLine = startStopStateToggleCounter + graphLine = currentVe graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip - graphLine = tractionControlSparkSkip liveGraph = engine_state_6_Graph, "Graph", South + graphLine = tractionControlSparkSkip graphLine = fuelInjectionCounter graphLine = globalSparkCounter graphLine = fuelingLoad - graphLine = ignitionLoad liveGraph = engine_state_7_Graph, "Graph", South + graphLine = ignitionLoad graphLine = veTableYAxis graphLine = overDwellCounter graphLine = overDwellNotScheduledCounter + liveGraph = engine_state_8_Graph, "Graph", South graphLine = sparkOutOfOrderCounter indicatorPanel = tps_accel_stateIndicatorPanel, 2 @@ -7754,15 +7758,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} dialog = injectorNonlinearPolynomial, "Polynomial Adder", yAxis + field = "Also known as GM mode" field = "Add nonlinearity below pulse", applyNonlinearBelowPulse - field = "constant", injectorCorrectionPolynomial1 - field = "x^1", injectorCorrectionPolynomial2 - field = "x^2", injectorCorrectionPolynomial3 - field = "x^3", injectorCorrectionPolynomial4 - field = "x^4", injectorCorrectionPolynomial5 - field = "x^5", injectorCorrectionPolynomial6 - field = "x^6", injectorCorrectionPolynomial7 - field = "x^7", injectorCorrectionPolynomial8 + field = "constant offset", injectorCorrectionPolynomial1 + field = "multiplier for pulsewidth", injectorCorrectionPolynomial2 + field = "multiplier for pulsewidth^2", injectorCorrectionPolynomial3 + field = "multiplier for pulsewidth^3", injectorCorrectionPolynomial4 + field = "multiplier for pulsewidth^4", injectorCorrectionPolynomial5 + field = "multiplier for pulsewidth^5", injectorCorrectionPolynomial6 + field = "multiplier for pulsewidth^6", injectorCorrectionPolynomial7 + field = "multiplier for pulsewidth^7", injectorCorrectionPolynomial8 dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis field = "Small pulse slope (ALOSL)", fordInjectorSmallPulseSlope diff --git a/generated/tunerstudio/generated/signature_XYZ.txt b/generated/tunerstudio/generated/signature_XYZ.txt index d416201..7af118a 100644 --- a/generated/tunerstudio/generated/signature_XYZ.txt +++ b/generated/tunerstudio/generated/signature_XYZ.txt @@ -1,4 +1,4 @@ ! Generated by gen_signature.sh ! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar ! gen_signature.sh Using env variable branch [main] -#define TS_SIGNATURE "rusEFI main.2025.04.01.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2025.04.02.XYZ.@@SIGNATURE_HASH@@"