From 7ee7eec7385a077b83e2c5a0fad1cbc2d449bf60 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Sat, 28 Dec 2024 00:27:57 +0000 Subject: [PATCH] Custom Auto-generated Configs [no ci] --- .../console/binary/generated/data_logs.ini | 1 - .../binary/generated/fancy_content.ini | 5 +- .../console/binary/generated/live_data_ids.h | 24 +- .../binary/generated/output_channels.ini | 391 +++++++++-------- .../generated/total_live_data_generated.h | 2 +- .../console/binary_log/log_fields_generated.h | 1 - .../generated/rusefi_generated_XYZ.h | 6 +- .../controllers/generated/signature_XYZ.h | 4 +- .../engine_state_generated.h | 34 +- .../tunerstudio/generated/rusefi_XYZ.ini | 403 +++++++++--------- .../tunerstudio/generated/signature_XYZ.txt | 2 +- 11 files changed, 427 insertions(+), 446 deletions(-) diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index 5f1789b..d46a1a2 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/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/generated/console/binary/generated/fancy_content.ini b/generated/console/binary/generated/fancy_content.ini index 415d61f..576fdda 100644 --- a/generated/console/binary/generated/fancy_content.ini +++ b/generated/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/generated/console/binary/generated/live_data_ids.h b/generated/console/binary/generated/live_data_ids.h index b207074..ced376a 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 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/generated/console/binary/generated/output_channels.ini b/generated/console/binary/generated/output_channels.ini index 7f48c9e..17ab6ad 100644 --- a/generated/console/binary/generated/output_channels.ini +++ b/generated/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/generated/console/binary/generated/total_live_data_generated.h b/generated/console/binary/generated/total_live_data_generated.h index c64679d..c084bc6 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 1808 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1804 \ 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 4c3f8b5..3488e6e 100644 --- a/generated/console/binary_log/log_fields_generated.h +++ b/generated/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/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 9fc2e10..8794004 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 254565067 +#define SIGNATURE_HASH 134363858 #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 main.2024.12.27.XYZ.254565067" +#define TS_SIGNATURE "rusEFI main.2024.12.28.XYZ.134363858" #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/generated/controllers/generated/signature_XYZ.h b/generated/controllers/generated/signature_XYZ.h index fcdc13c..62b96a1 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 254565067 -#define TS_SIGNATURE "rusEFI main.2024.12.27.XYZ.254565067" +#define SIGNATURE_HASH 134363858 +#define TS_SIGNATURE "rusEFI main.2024.12.28.XYZ.134363858" diff --git a/generated/live_data_generated/engine_state_generated.h b/generated/live_data_generated/engine_state_generated.h index 242c723..a546875 100644 --- a/generated/live_data_generated/engine_state_generated.h +++ b/generated/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/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index 6100a70..e27a83a 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.2024.12.27.XYZ.254565067" + signature = "rusEFI main.2024.12.28.XYZ.134363858" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.12.27.XYZ.254565067" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.12.28.XYZ.134363858" ; 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, 23926, [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 } @@ -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" @@ -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/generated/tunerstudio/generated/signature_XYZ.txt b/generated/tunerstudio/generated/signature_XYZ.txt index a36e870..0c5ce7e 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.2024.12.27.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.12.28.XYZ.@@SIGNATURE_HASH@@"