diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 3c937799d0..35e7d01311 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -556,8 +556,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 0abbf9518d..01d4a4fb83 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -262,19 +262,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index bb30f21f1f..b16c58f793 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -47,15 +47,15 @@ LDS_lambda_monitor, #define FUEL_PUMP_CONTROL_BASE_ADDRESS 1048 #define MAIN_RELAY_BASE_ADDRESS 1052 #define ENGINE_STATE_BASE_ADDRESS 1056 -#define TPS_ACCEL_STATE_BASE_ADDRESS 1160 -#define TRIGGER_CENTRAL_BASE_ADDRESS 1208 -#define TRIGGER_STATE_BASE_ADDRESS 1268 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1308 -#define WALL_FUEL_STATE_BASE_ADDRESS 1316 -#define IDLE_STATE_BASE_ADDRESS 1324 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1372 -#define WIDEBAND_STATE_BASE_ADDRESS 1424 -#define DC_MOTORS_BASE_ADDRESS 1436 -#define SENT_STATE_BASE_ADDRESS 1448 -#define VVT_BASE_ADDRESS 1456 -#define LAMBDA_MONITOR_BASE_ADDRESS 1460 +#define TPS_ACCEL_STATE_BASE_ADDRESS 1152 +#define TRIGGER_CENTRAL_BASE_ADDRESS 1200 +#define TRIGGER_STATE_BASE_ADDRESS 1260 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1300 +#define WALL_FUEL_STATE_BASE_ADDRESS 1308 +#define IDLE_STATE_BASE_ADDRESS 1316 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1364 +#define WIDEBAND_STATE_BASE_ADDRESS 1416 +#define DC_MOTORS_BASE_ADDRESS 1428 +#define SENT_STATE_BASE_ADDRESS 1440 +#define VVT_BASE_ADDRESS 1448 +#define LAMBDA_MONITOR_BASE_ADDRESS 1452 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index ced2c30f47..ab1aa9769f 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -653,137 +653,135 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 0fbfa1bdc8..1c9eac5cce 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / LiveDataProcessor.java -#define TS_TOTAL_OUTPUT_SIZE 1468 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1460 \ No newline at end of file diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index e0e659358a..4bc32f8ee1 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -431,8 +431,6 @@ static const LogField fields[] = { {engine->engineState.smartChipRestartCounter, "smartChipRestartCounter", "", 0}, {engine->engineState.smartChipAliveCounter, "smartChipAliveCounter", "", 0}, {engine->engineState.startStopStateToggleCounter, "startStopStateToggleCounter", "", 0}, - {engine->engineState.egtValue1, "egtValue1", "", 0}, - {engine->engineState.egtValue2, "egtValue2", "", 0}, {engine->engineState.luaSoftSparkSkip, "luaSoftSparkSkip", "", 0}, {engine->engineState.luaHardSparkSkip, "luaHardSparkSkip", "", 0}, {engine->engineState.tractionControlSparkSkip, "tractionControlSparkSkip", "", 0}, diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index 080c36f410..74eb9459b1 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Tue Mar 05 03:31:23 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Mon Mar 11 20:56:12 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -335,68 +335,60 @@ struct engine_state_s { /** * offset 60 */ - float egtValue1 = (float)0; + float luaSoftSparkSkip = (float)0; /** * offset 64 */ - float egtValue2 = (float)0; - /** - * offset 68 - */ - float luaSoftSparkSkip = (float)0; - /** - * offset 72 - */ float luaHardSparkSkip = (float)0; /** - * offset 76 + * offset 68 */ float tractionControlSparkSkip = (float)0; /** * User-defined RPM hard limit * units: rpm - * offset 80 + * offset 72 */ int16_t desiredRpmLimit = (int16_t)0; /** * need 4 byte alignment * units: units - * offset 82 + * offset 74 */ - uint8_t alignmentFill_at_82[2]; + uint8_t alignmentFill_at_74[2]; /** * Fuel: Injection counter - * offset 84 + * offset 76 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** * Ign: Spark counter - * offset 88 + * offset 80 */ uint32_t globalSparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 92 + * offset 84 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 96 + * offset 88 */ float ignitionLoad = (float)0; /** * units: % - * offset 100 + * offset 92 */ scaled_channel veTableYAxis = (uint16_t)0; /** * need 4 byte alignment * units: units - * offset 102 + * offset 94 */ - uint8_t alignmentFill_at_102[2]; + uint8_t alignmentFill_at_94[2]; }; -static_assert(sizeof(engine_state_s) == 104); +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 Tue Mar 05 03:31:23 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Mon Mar 11 20:56:12 UTC 2024 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 20556ae0d0..3473636f42 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3595445766 +#define SIGNATURE_HASH 313626266 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-2chan.3595445766" +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-2chan.313626266" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index 8a2b2b4753..20da5885cc 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1189,7 +1189,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 432169645 +#define SIGNATURE_HASH 3711814193 #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" @@ -1550,14 +1550,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-4chan.432169645" +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-4chan.3711814193" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 7bfcbc5264..89f52bf38e 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1189,7 +1189,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 432169645 +#define SIGNATURE_HASH 3711814193 #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" @@ -1550,14 +1550,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-4chan_f7.432169645" +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-4chan_f7.3711814193" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index 35f24b8a44..f2b7eaaa80 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4013365055 +#define SIGNATURE_HASH 734576547 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan-revA.4013365055" +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan-revA.734576547" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index eb0150e6c6..7c4c1f4447 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2524522964 +#define SIGNATURE_HASH 1384546632 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan.2524522964" +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan.1384546632" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 62e12f526e..5023bacfee 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2524522964 +#define SIGNATURE_HASH 1384546632 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan_f7.2524522964" +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan_f7.1384546632" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index 501663ffd4..be1c97bdf5 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3101465768 +#define SIGNATURE_HASH 2082681908 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.at_start_f435.3101465768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.at_start_f435.2082681908" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index 2f62f1719b..2616646383 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4242229478 +#define SIGNATURE_HASH 941940858 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.atlas.4242229478" +#define TS_SIGNATURE "rusEFI master.2024.03.11.atlas.941940858" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 64bb9e9cc6..25482a0180 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 479029193 +#define SIGNATURE_HASH 3631402837 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.f407-discovery.479029193" +#define TS_SIGNATURE "rusEFI master.2024.03.11.f407-discovery.3631402837" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index c1a6c6a8aa..fbe611d25a 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3101465768 +#define SIGNATURE_HASH 2082681908 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.f429-discovery.3101465768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.f429-discovery.2082681908" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index 6b7831e0cf..f137581c8b 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2316016187 +#define SIGNATURE_HASH 1324626599 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.f469-discovery.2316016187" +#define TS_SIGNATURE "rusEFI master.2024.03.11.f469-discovery.1324626599" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index 854bdde50c..8a11bdb40d 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 3999262899 +#define SIGNATURE_HASH 715145263 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.frankenso_na6.3999262899" +#define TS_SIGNATURE "rusEFI master.2024.03.11.frankenso_na6.715145263" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index b182c1fce7..7a1d1d07af 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3101465768 +#define SIGNATURE_HASH 2082681908 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.haba208.3101465768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.haba208.2082681908" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index 8a9f13cd4b..c1a05e41f2 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 835978284 +#define SIGNATURE_HASH 4113280176 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-112-17.835978284" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-112-17.4113280176" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index 91e39642eb..62b56d8e2d 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1957034768 +#define SIGNATURE_HASH 2958709644 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-gm-e67.1957034768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-gm-e67.2958709644" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index 76e5b0941a..4fb045002e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 322823542 +#define SIGNATURE_HASH 3619835370 #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" @@ -1550,14 +1550,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-honda-k.322823542" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-honda-k.3619835370" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index 1f41883405..33ddf9ef14 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1371826824 +#define SIGNATURE_HASH 2503721492 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-nb1.1371826824" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-nb1.2503721492" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 46d5c759d7..1fa1651b63 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2506502847 +#define SIGNATURE_HASH 1369020963 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen121nissan.2506502847" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen121nissan.1369020963" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index acbd0da279..d75af610ca 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2292547918 +#define SIGNATURE_HASH 1280977362 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen121vag.2292547918" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen121vag.1280977362" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index a342d452b3..5941c6c483 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1431221855 +#define SIGNATURE_HASH 2444304067 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen128.1431221855" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen128.2444304067" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index 1cd4f1b324..7e5a6a6488 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2340161686 +#define SIGNATURE_HASH 1334026250 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen154hyundai.2340161686" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen154hyundai.1334026250" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index 570cd2189f..7d82933a1a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2340161686 +#define SIGNATURE_HASH 1334026250 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen154hyundai_f7.2340161686" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen154hyundai_f7.1334026250" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index bac37bf532..277081d97c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 943548468 +#define SIGNATURE_HASH 4240621736 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen72.943548468" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen72.4240621736" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index 29ba49ef16..9d250b8254 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3712748622 +#define SIGNATURE_HASH 431203538 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen81.3712748622" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen81.431203538" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 7289f7f784..51ff7f0ce4 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3396278541 +#define SIGNATURE_HASH 244363665 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output false -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen88bmw.3396278541" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen88bmw.244363665" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index a1ce3b6d84..618fcee1fd 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 746159944 +#define SIGNATURE_HASH 3901151188 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellenNA6.746159944" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellenNA6.3901151188" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 72a7fc7eaf..50c6ddb0be 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1189,7 +1189,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3550690694 +#define SIGNATURE_HASH 391943450 #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" @@ -1550,14 +1550,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellenNA8_96.3550690694" +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellenNA8_96.391943450" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 53ec8db634..e8eccfdabe 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 208053367 +#define SIGNATURE_HASH 3365473515 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.m74_9.208053367" +#define TS_SIGNATURE "rusEFI master.2024.03.11.m74_9.3365473515" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index fc1bb4f15b..0033132e10 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3138634327 +#define SIGNATURE_HASH 2146200267 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.mre_f4.3138634327" +#define TS_SIGNATURE "rusEFI master.2024.03.11.mre_f4.2146200267" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 9271365b57..74449f09d0 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3138634327 +#define SIGNATURE_HASH 2146200267 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.mre_f7.3138634327" +#define TS_SIGNATURE "rusEFI master.2024.03.11.mre_f7.2146200267" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index 1f57f6843c..9ccd3f4305 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3101465768 +#define SIGNATURE_HASH 2082681908 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.nucleo_f413.3101465768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.nucleo_f413.2082681908" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_405.h b/firmware/controllers/generated/rusefi_generated_prometheus_405.h index 2240d70c4f..456c6a1367 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_405.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_405.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2286440760 +#define SIGNATURE_HASH 1287125412 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.prometheus_405.2286440760" +#define TS_SIGNATURE "rusEFI master.2024.03.11.prometheus_405.1287125412" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_469.h b/firmware/controllers/generated/rusefi_generated_prometheus_469.h index 9cd80e67d2..d9af5f5804 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_469.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_469.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2286440760 +#define SIGNATURE_HASH 1287125412 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.prometheus_469.2286440760" +#define TS_SIGNATURE "rusEFI master.2024.03.11.prometheus_469.1287125412" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index c17c68ee3f..92f9c789ee 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1367046751 +#define SIGNATURE_HASH 2508509891 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_f4.1367046751" +#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_f4.2508509891" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index 679711d613..6efd53ba46 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1367046751 +#define SIGNATURE_HASH 2508509891 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_f7.1367046751" +#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_f7.2508509891" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index a5c04386e7..fb05f1be6c 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1367046751 +#define SIGNATURE_HASH 2508509891 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_h7.1367046751" +#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_h7.2508509891" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index dac2705448..818bb8f395 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 123149418 +#define SIGNATURE_HASH 3282613494 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.s105.123149418" +#define TS_SIGNATURE "rusEFI master.2024.03.11.s105.3282613494" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index 94f7c3cdd3..037ece1dfa 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1188,7 +1188,7 @@ #define show_Proteus_presets false #define show_small_can_board_presets true #define show_test_presets false -#define SIGNATURE_HASH 2256359457 +#define SIGNATURE_HASH 1115879613 #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" @@ -1550,14 +1550,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.small-can-board.2256359457" +#define TS_SIGNATURE "rusEFI master.2024.03.11.small-can-board.1115879613" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index bfb6b9be7d..ed4ec1d236 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3101465768 +#define SIGNATURE_HASH 2082681908 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32f429_nucleo.3101465768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32f429_nucleo.2082681908" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index 8516ae8b5c..7d7f2424f2 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3101465768 +#define SIGNATURE_HASH 2082681908 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32f767_nucleo.3101465768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32f767_nucleo.2082681908" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index 4070306a75..e76957c265 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3101465768 +#define SIGNATURE_HASH 2082681908 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32h743_nucleo.3101465768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32h743_nucleo.2082681908" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index 6f5e4e1775..b2780e05b2 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3101465768 +#define SIGNATURE_HASH 2082681908 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.t-b-g.3101465768" +#define TS_SIGNATURE "rusEFI master.2024.03.11.t-b-g.2082681908" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index 031709bddf..e4f26a6c06 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1187,7 +1187,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 846377098 +#define SIGNATURE_HASH 4136441878 #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" @@ -1548,14 +1548,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.tdg-pdm8.846377098" +#define TS_SIGNATURE "rusEFI master.2024.03.11.tdg-pdm8.4136441878" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 3d6ecfea05..048237b50d 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1188,7 +1188,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_uaefi_presets true -#define SIGNATURE_HASH 3265716627 +#define SIGNATURE_HASH 106514703 #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" @@ -1549,14 +1549,14 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.03.11.uaefi.3265716627" +#define TS_SIGNATURE "rusEFI master.2024.03.11.uaefi.106514703" #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 1468 +#define TS_TOTAL_OUTPUT_SIZE 1460 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 343c0feea1..54d26c7b16 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3595445766 -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-2chan.3595445766" +#define SIGNATURE_HASH 313626266 +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-2chan.313626266" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index d35125e367..c4df10d450 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 432169645 -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-4chan.432169645" +#define SIGNATURE_HASH 3711814193 +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-4chan.3711814193" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 02669f10d5..69d8727e4a 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 432169645 -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-4chan_f7.432169645" +#define SIGNATURE_HASH 3711814193 +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-4chan_f7.3711814193" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 7a2e11c3e2..a42b0baad1 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4013365055 -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan-revA.4013365055" +#define SIGNATURE_HASH 734576547 +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan-revA.734576547" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index be7188cdee..4d39fe722a 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2524522964 -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan.2524522964" +#define SIGNATURE_HASH 1384546632 +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan.1384546632" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 32c9407d12..8da53821d6 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2524522964 -#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan_f7.2524522964" +#define SIGNATURE_HASH 1384546632 +#define TS_SIGNATURE "rusEFI master.2024.03.11.alphax-8chan_f7.1384546632" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index cd9051b9e1..ed28400267 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101465768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.at_start_f435.3101465768" +#define SIGNATURE_HASH 2082681908 +#define TS_SIGNATURE "rusEFI master.2024.03.11.at_start_f435.2082681908" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index af5eec931a..f8f8b766ef 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4242229478 -#define TS_SIGNATURE "rusEFI master.2024.03.11.atlas.4242229478" +#define SIGNATURE_HASH 941940858 +#define TS_SIGNATURE "rusEFI master.2024.03.11.atlas.941940858" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 3bd9020ab8..b700bc8f86 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 479029193 -#define TS_SIGNATURE "rusEFI master.2024.03.11.f407-discovery.479029193" +#define SIGNATURE_HASH 3631402837 +#define TS_SIGNATURE "rusEFI master.2024.03.11.f407-discovery.3631402837" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index dcd4ed3e24..8fb1261086 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101465768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.f429-discovery.3101465768" +#define SIGNATURE_HASH 2082681908 +#define TS_SIGNATURE "rusEFI master.2024.03.11.f429-discovery.2082681908" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index fdecd97f72..5863b4de31 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2316016187 -#define TS_SIGNATURE "rusEFI master.2024.03.11.f469-discovery.2316016187" +#define SIGNATURE_HASH 1324626599 +#define TS_SIGNATURE "rusEFI master.2024.03.11.f469-discovery.1324626599" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 5d75c36fc7..6437ebf05a 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3999262899 -#define TS_SIGNATURE "rusEFI master.2024.03.11.frankenso_na6.3999262899" +#define SIGNATURE_HASH 715145263 +#define TS_SIGNATURE "rusEFI master.2024.03.11.frankenso_na6.715145263" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index 06ebf4a4e0..1c22f2b910 100644 --- a/firmware/controllers/generated/signature_haba208.h +++ b/firmware/controllers/generated/signature_haba208.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101465768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.haba208.3101465768" +#define SIGNATURE_HASH 2082681908 +#define TS_SIGNATURE "rusEFI master.2024.03.11.haba208.2082681908" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index ef4aa75afe..98091e07cb 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 835978284 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-112-17.835978284" +#define SIGNATURE_HASH 4113280176 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-112-17.4113280176" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 236f36fb57..8880042745 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1957034768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-gm-e67.1957034768" +#define SIGNATURE_HASH 2958709644 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-gm-e67.2958709644" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 0eca330b66..b9005c11bd 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 322823542 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-honda-k.322823542" +#define SIGNATURE_HASH 3619835370 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-honda-k.3619835370" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index c88ad8be25..ca5aa0c63a 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1371826824 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-nb1.1371826824" +#define SIGNATURE_HASH 2503721492 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen-nb1.2503721492" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 7051644ac8..bfa2561530 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2506502847 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen121nissan.2506502847" +#define SIGNATURE_HASH 1369020963 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen121nissan.1369020963" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 84053606d5..6d4a2f88a2 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2292547918 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen121vag.2292547918" +#define SIGNATURE_HASH 1280977362 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen121vag.1280977362" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index fcb3888c25..c1bc255b00 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1431221855 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen128.1431221855" +#define SIGNATURE_HASH 2444304067 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen128.2444304067" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 1d666c6a86..406147f4c6 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2340161686 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen154hyundai.2340161686" +#define SIGNATURE_HASH 1334026250 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen154hyundai.1334026250" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index 81007d5d82..67774eb5b5 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/signature_hellen154hyundai_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2340161686 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen154hyundai_f7.2340161686" +#define SIGNATURE_HASH 1334026250 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen154hyundai_f7.1334026250" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 2af872054f..150c600d1f 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 943548468 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen72.943548468" +#define SIGNATURE_HASH 4240621736 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen72.4240621736" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a356813193..58dc1ca535 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3712748622 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen81.3712748622" +#define SIGNATURE_HASH 431203538 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen81.431203538" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 2e5df5f184..59cb74896a 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3396278541 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen88bmw.3396278541" +#define SIGNATURE_HASH 244363665 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellen88bmw.244363665" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 00e0479583..67d88336c4 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 746159944 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellenNA6.746159944" +#define SIGNATURE_HASH 3901151188 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellenNA6.3901151188" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 60617fee55..d0547e058c 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3550690694 -#define TS_SIGNATURE "rusEFI master.2024.03.11.hellenNA8_96.3550690694" +#define SIGNATURE_HASH 391943450 +#define TS_SIGNATURE "rusEFI master.2024.03.11.hellenNA8_96.391943450" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 9bf3a7f161..d8fb0718e4 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 208053367 -#define TS_SIGNATURE "rusEFI master.2024.03.11.m74_9.208053367" +#define SIGNATURE_HASH 3365473515 +#define TS_SIGNATURE "rusEFI master.2024.03.11.m74_9.3365473515" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 2fa7251f41..f8400afa95 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3138634327 -#define TS_SIGNATURE "rusEFI master.2024.03.11.mre_f4.3138634327" +#define SIGNATURE_HASH 2146200267 +#define TS_SIGNATURE "rusEFI master.2024.03.11.mre_f4.2146200267" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 710fa66da0..9f78cb63d1 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3138634327 -#define TS_SIGNATURE "rusEFI master.2024.03.11.mre_f7.3138634327" +#define SIGNATURE_HASH 2146200267 +#define TS_SIGNATURE "rusEFI master.2024.03.11.mre_f7.2146200267" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index 685ddcde22..6a3f6ed36e 100644 --- a/firmware/controllers/generated/signature_nucleo_f413.h +++ b/firmware/controllers/generated/signature_nucleo_f413.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101465768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.nucleo_f413.3101465768" +#define SIGNATURE_HASH 2082681908 +#define TS_SIGNATURE "rusEFI master.2024.03.11.nucleo_f413.2082681908" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 977d75149b..81c961f564 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2286440760 -#define TS_SIGNATURE "rusEFI master.2024.03.11.prometheus_405.2286440760" +#define SIGNATURE_HASH 1287125412 +#define TS_SIGNATURE "rusEFI master.2024.03.11.prometheus_405.1287125412" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index cfef38080c..51aa584572 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2286440760 -#define TS_SIGNATURE "rusEFI master.2024.03.11.prometheus_469.2286440760" +#define SIGNATURE_HASH 1287125412 +#define TS_SIGNATURE "rusEFI master.2024.03.11.prometheus_469.1287125412" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8ada94908c..20df849259 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1367046751 -#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_f4.1367046751" +#define SIGNATURE_HASH 2508509891 +#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_f4.2508509891" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index fb7fbf2c8d..988e8bbd94 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1367046751 -#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_f7.1367046751" +#define SIGNATURE_HASH 2508509891 +#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_f7.2508509891" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 2741532c46..2ecfb84edf 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1367046751 -#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_h7.1367046751" +#define SIGNATURE_HASH 2508509891 +#define TS_SIGNATURE "rusEFI master.2024.03.11.proteus_h7.2508509891" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 39e60e5b09..a279c8565d 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 123149418 -#define TS_SIGNATURE "rusEFI master.2024.03.11.s105.123149418" +#define SIGNATURE_HASH 3282613494 +#define TS_SIGNATURE "rusEFI master.2024.03.11.s105.3282613494" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index dd86932b8b..8070942c41 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2256359457 -#define TS_SIGNATURE "rusEFI master.2024.03.11.small-can-board.2256359457" +#define SIGNATURE_HASH 1115879613 +#define TS_SIGNATURE "rusEFI master.2024.03.11.small-can-board.1115879613" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 708b2c8bda..d67eb0d3c6 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101465768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32f429_nucleo.3101465768" +#define SIGNATURE_HASH 2082681908 +#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32f429_nucleo.2082681908" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index d3bc8feb71..93ea3ffc93 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101465768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32f767_nucleo.3101465768" +#define SIGNATURE_HASH 2082681908 +#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32f767_nucleo.2082681908" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index 8555f08c93..38b136f631 100644 --- a/firmware/controllers/generated/signature_stm32h743_nucleo.h +++ b/firmware/controllers/generated/signature_stm32h743_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101465768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32h743_nucleo.3101465768" +#define SIGNATURE_HASH 2082681908 +#define TS_SIGNATURE "rusEFI master.2024.03.11.stm32h743_nucleo.2082681908" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 4b231b6b30..865a70ec6f 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101465768 -#define TS_SIGNATURE "rusEFI master.2024.03.11.t-b-g.3101465768" +#define SIGNATURE_HASH 2082681908 +#define TS_SIGNATURE "rusEFI master.2024.03.11.t-b-g.2082681908" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index a15c850d2f..ac4443f7a1 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 846377098 -#define TS_SIGNATURE "rusEFI master.2024.03.11.tdg-pdm8.846377098" +#define SIGNATURE_HASH 4136441878 +#define TS_SIGNATURE "rusEFI master.2024.03.11.tdg-pdm8.4136441878" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index e3fc7c01b5..562fd96210 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3265716627 -#define TS_SIGNATURE "rusEFI master.2024.03.11.uaefi.3265716627" +#define SIGNATURE_HASH 106514703 +#define TS_SIGNATURE "rusEFI master.2024.03.11.uaefi.106514703" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 8b5efb9e1b..e21967c83e 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1200,12 +1200,6 @@ float getOutputValueByName(const char *name) { // startStopStateToggleCounter case -960645892: return engine->engineState.startStopStateToggleCounter; -// egtValue1 - case -244414221: - return engine->engineState.egtValue1; -// egtValue2 - case -244414220: - return engine->engineState.egtValue2; // luaSoftSparkSkip case -1117430949: return engine->engineState.luaSoftSparkSkip; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index b7ad6e6a2e..0613485035 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.f407-discovery.479029193" + signature = "rusEFI master.2024.03.11.f407-discovery.3631402837" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.f407-discovery.479029193" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.f407-discovery.3631402837" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:28 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:35 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5422,8 +5420,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6394,19 +6390,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 06fb55ca6b..016e0c0f49 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.alphax-2chan.3595445766" + signature = "rusEFI master.2024.03.11.alphax-2chan.313626266" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.alphax-2chan.3595445766" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.alphax-2chan.313626266" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","INVALID","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2","X7 - AIN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:41 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:43 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6387,19 +6383,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index af7a413042..2443a6fb1f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.alphax-4chan.432169645" + signature = "rusEFI master.2024.03.11.alphax-4chan.3711814193" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.alphax-4chan.432169645" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.alphax-4chan.3711814193" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:30 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:51 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6406,19 +6402,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 7bd174ba2f..cd62b1734c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.alphax-4chan_f7.432169645" + signature = "rusEFI master.2024.03.11.alphax-4chan_f7.3711814193" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.alphax-4chan_f7.432169645" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.alphax-4chan_f7.3711814193" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:29 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:52 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6406,19 +6402,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 4ef2565e61..e5085e1418 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.alphax-8chan-revA.4013365055" + signature = "rusEFI master.2024.03.11.alphax-8chan-revA.734576547" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.alphax-8chan-revA.4013365055" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.alphax-8chan-revA.734576547" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:21 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:44 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index f2d9336df2..551256f7e3 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.alphax-8chan.2524522964" + signature = "rusEFI master.2024.03.11.alphax-8chan.1384546632" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.alphax-8chan.2524522964" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.alphax-8chan.1384546632" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:23 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:39 UTC 2024 pageSize = 22252 page = 1 @@ -2474,7 +2474,7 @@ injectorStagingRpmBins = array, U16, 22238, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3144,140 +3144,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5424,8 +5422,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6394,19 +6390,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index f94847eb11..028592242b 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.alphax-8chan_f7.2524522964" + signature = "rusEFI master.2024.03.11.alphax-8chan_f7.1384546632" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.alphax-8chan_f7.2524522964" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.alphax-8chan_f7.1384546632" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:24 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:42 UTC 2024 pageSize = 22252 page = 1 @@ -2474,7 +2474,7 @@ injectorStagingRpmBins = array, U16, 22238, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3144,140 +3144,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5424,8 +5422,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6394,19 +6390,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 0f2a7d93b8..5080154ffd 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.at_start_f435.3101465768" + signature = "rusEFI master.2024.03.11.at_start_f435.2082681908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.at_start_f435.3101465768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.at_start_f435.2082681908" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:56 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:24 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index b0228f5944..65c007f63b 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.atlas.4242229478" + signature = "rusEFI master.2024.03.11.atlas.941940858" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.atlas.4242229478" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.atlas.941940858" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:54 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:15 UTC 2024 pageSize = 21736 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 21722, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 66fe9d5300..7e16ed3333 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.f407-discovery.479029193" + signature = "rusEFI master.2024.03.11.f407-discovery.3631402837" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.f407-discovery.479029193" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.f407-discovery.3631402837" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:12 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:30 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5422,8 +5420,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6394,19 +6390,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index b188caeeed..4bb8069207 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.f429-discovery.3101465768" + signature = "rusEFI master.2024.03.11.f429-discovery.2082681908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.f429-discovery.3101465768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.f429-discovery.2082681908" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:02 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:16 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 52ed48fd68..0a66ced20c 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.f469-discovery.2316016187" + signature = "rusEFI master.2024.03.11.f469-discovery.1324626599" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.f469-discovery.2316016187" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.f469-discovery.1324626599" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:00 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:18 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 605d5b0890..c86ff83013 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.frankenso_na6.3999262899" + signature = "rusEFI master.2024.03.11.frankenso_na6.715145263" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.frankenso_na6.3999262899" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.frankenso_na6.715145263" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:01 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:14 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index a6a46cc300..f4cee537f3 100644 --- a/firmware/tunerstudio/generated/rusefi_haba208.ini +++ b/firmware/tunerstudio/generated/rusefi_haba208.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.haba208.3101465768" + signature = "rusEFI master.2024.03.11.haba208.2082681908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.haba208.3101465768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.haba208.2082681908" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:57 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:54 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index b99954c099..fecc777ab2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen-112-17.835978284" + signature = "rusEFI master.2024.03.11.hellen-112-17.4113280176" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen-112-17.835978284" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen-112-17.4113280176" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","B20 TPS Throttle Position 2","A14 Analog Input","INVALID","A21 PPS1","B03 TPS Throttle Position 1","INVALID","A07 TODO","A12 Analog Input","A10 Analog Input","INVALID","B19 MAP","A09 Analog Input","B15 CLT","B27 IAT","A11 Analog Input","A19 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:31 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:27 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6387,19 +6383,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 699b1deaaf..3f7d764bda 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen-gm-e67.1957034768" + signature = "rusEFI master.2024.03.11.hellen-gm-e67.2958709644" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen-gm-e67.1957034768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen-gm-e67.2958709644" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:39 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:32 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 340f261ec6..eb131c3b7e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen-honda-k.322823542" + signature = "rusEFI master.2024.03.11.hellen-honda-k.3619835370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen-honda-k.322823542" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen-honda-k.3619835370" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","Aux Analog 3","Aux Analog 1","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT","Aux Analog 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:37 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:30 UTC 2024 pageSize = 22908 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22894, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6364,19 +6360,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index db2ae0d3fb..6cf398798f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen-nb1.1371826824" + signature = "rusEFI master.2024.03.11.hellen-nb1.2503721492" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen-nb1.1371826824" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen-nb1.2503721492" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:35 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:46 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index f0ea0679d9..7217487dda 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen121nissan.2506502847" + signature = "rusEFI master.2024.03.11.hellen121nissan.1369020963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen121nissan.2506502847" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen121nissan.1369020963" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:34 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:38 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6387,19 +6383,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 38004ff990..dce07e3b60 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen121vag.2292547918" + signature = "rusEFI master.2024.03.11.hellen121vag.1280977362" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen121vag.2292547918" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen121vag.1280977362" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:20 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:19 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 9a01a0f38b..c5ec61b090 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen128.1431221855" + signature = "rusEFI master.2024.03.11.hellen128.2444304067" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen128.1431221855" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen128.2444304067" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:45 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:34 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 9a6c8aaf6d..8238121ad0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen154hyundai.2340161686" + signature = "rusEFI master.2024.03.11.hellen154hyundai.1334026250" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen154hyundai.2340161686" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen154hyundai.1334026250" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:48 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:20 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6370,19 +6366,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index 27224dc82c..967706af62 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen154hyundai_f7.2340161686" + signature = "rusEFI master.2024.03.11.hellen154hyundai_f7.1334026250" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen154hyundai_f7.2340161686" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen154hyundai_f7.1334026250" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:46 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:22 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6370,19 +6366,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index b210c1e98a..be5480bfe4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen72.943548468" + signature = "rusEFI master.2024.03.11.hellen72.4240621736" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen72.943548468" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen72.4240621736" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:19 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:47 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 06ae24e384..bda16d87db 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen81.3712748622" + signature = "rusEFI master.2024.03.11.hellen81.431203538" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen81.3712748622" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen81.431203538" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:42 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:26 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6387,19 +6383,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index eb93ed5adc..84f5aa1c5d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellen88bmw.3396278541" + signature = "rusEFI master.2024.03.11.hellen88bmw.244363665" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellen88bmw.3396278541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellen88bmw.244363665" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:15 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:23 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6385,19 +6381,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 4f419d038e..7371fac005 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellenNA6.746159944" + signature = "rusEFI master.2024.03.11.hellenNA6.3901151188" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellenNA6.746159944" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellenNA6.3901151188" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:17 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:35 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 675b4901c8..c17e5fbd7c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.hellenNA8_96.3550690694" + signature = "rusEFI master.2024.03.11.hellenNA8_96.391943450" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.hellenNA8_96.3550690694" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.hellenNA8_96.391943450" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:27 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:18 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 1bb29c7c57..9f9401091a 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.m74_9.208053367" + signature = "rusEFI master.2024.03.11.m74_9.3365473515" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.m74_9.208053367" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.m74_9.3365473515" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","MAF/MAP sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Pedal position sensor 1 signal PPS1","Pedal position sensor 2 signal PPS2","ETB TPS position sensor 1 signal","ETB TPS position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:53 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:00 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6391,19 +6387,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 2695e732ec..854b7fd602 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.mre_f4.3138634327" + signature = "rusEFI master.2024.03.11.mre_f4.2146200267" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.mre_f4.3138634327" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.mre_f4.2146200267" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:09 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:55 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5422,8 +5420,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6409,19 +6405,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 63e9184a86..9e09095362 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.mre_f7.3138634327" + signature = "rusEFI master.2024.03.11.mre_f7.2146200267" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.mre_f7.3138634327" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.mre_f7.2146200267" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:10 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:57 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5422,8 +5420,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6409,19 +6405,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index 9109719639..a5358cc52f 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.nucleo_f413.3101465768" + signature = "rusEFI master.2024.03.11.nucleo_f413.2082681908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.nucleo_f413.3101465768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.nucleo_f413.2082681908" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:21 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:19 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index acf8691ed9..9cffb28222 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.prometheus_405.2286440760" + signature = "rusEFI master.2024.03.11.prometheus_405.1287125412" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.prometheus_405.2286440760" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.prometheus_405.1287125412" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:05 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:26 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6383,19 +6379,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index e4bdec0c75..a5e57487de 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.prometheus_469.2286440760" + signature = "rusEFI master.2024.03.11.prometheus_469.1287125412" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.prometheus_469.2286440760" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.prometheus_469.1287125412" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:04 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:27 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6383,19 +6379,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a56ee23afb..5c55886b01 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.proteus_f4.1367046751" + signature = "rusEFI master.2024.03.11.proteus_f4.2508509891" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.proteus_f4.1367046751" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.proteus_f4.2508509891" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:06 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:02 UTC 2024 pageSize = 26236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 26222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6414,19 +6410,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 1a447b1bdb..897f1f2509 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.proteus_f7.1367046751" + signature = "rusEFI master.2024.03.11.proteus_f7.2508509891" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.proteus_f7.1367046751" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.proteus_f7.2508509891" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:10 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:03 UTC 2024 pageSize = 26236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 26222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6414,19 +6410,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 14c5dd6e6b..bd072500a0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.proteus_h7.1367046751" + signature = "rusEFI master.2024.03.11.proteus_h7.2508509891" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.proteus_h7.1367046751" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.proteus_h7.2508509891" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:08 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:04 UTC 2024 pageSize = 26236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 26222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6414,19 +6410,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 2b46c68957..52c9a1f6e2 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.s105.123149418" + signature = "rusEFI master.2024.03.11.s105.3282613494" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.s105.123149418" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.s105.3282613494" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:20 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:59 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6389,19 +6385,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 2e28e7ec6c..9012264f9f 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.small-can-board.2256359457" + signature = "rusEFI master.2024.03.11.small-can-board.1115879613" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.small-can-board.2256359457" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.small-can-board.1115879613" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input 6","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input 7","C4 - Analog/Digital Input 8" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:49 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:49 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index c1798b80fa..91ce7bd535 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.stm32f429_nucleo.3101465768" + signature = "rusEFI master.2024.03.11.stm32f429_nucleo.2082681908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.stm32f429_nucleo.3101465768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.stm32f429_nucleo.2082681908" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:08 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:58 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 9726d69dc9..7943718a6c 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.stm32f767_nucleo.3101465768" + signature = "rusEFI master.2024.03.11.stm32f767_nucleo.2082681908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.stm32f767_nucleo.3101465768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.stm32f767_nucleo.2082681908" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:22 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:20 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index 1692c012d1..b2b8f1473d 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.stm32h743_nucleo.3101465768" + signature = "rusEFI master.2024.03.11.stm32h743_nucleo.2082681908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.stm32h743_nucleo.3101465768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.stm32h743_nucleo.2082681908" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:52 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:25 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 6921568dce..edd6c664a2 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.t-b-g.3101465768" + signature = "rusEFI master.2024.03.11.t-b-g.2082681908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.t-b-g.3101465768" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.t-b-g.2082681908" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:18 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:28 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 9e5d791f0c..ac7d699ee2 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.tdg-pdm8.846377098" + signature = "rusEFI master.2024.03.11.tdg-pdm8.4136441878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.tdg-pdm8.846377098" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.tdg-pdm8.4136441878" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:59 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:32 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6388,19 +6384,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 4e12a00134..a4b9eed285 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.03.11.uaefi.3265716627" + signature = "rusEFI master.2024.03.11.uaefi.106514703" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.03.11.uaefi.3265716627" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.03.11.uaefi.106514703" ; 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 @@ -99,7 +99,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","C15 Fuel Pressure / AUX3","C14 TPS2","INVALID","D9 MAP","On-board MAP","D16 CLT Coolant","D15 IAT","C4 PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:21:44 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:56:36 UTC 2024 pageSize = 22236 page = 1 @@ -2471,7 +2471,7 @@ injectorStagingRpmBins = array, U16, 22222, [6], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1468 + ochBlockSize = 1460 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3141,140 +3141,138 @@ luaDigitalState1 = bits, U32, 1108, [5:5] luaDigitalState2 = bits, U32, 1108, [6:6] luaDigitalState3 = bits, U32, 1108, [7:7] startStopStateToggleCounter = scalar, U32, 1112, "", 1, 0 -egtValue1 = scalar, F32, 1116, "", 1, 0 -egtValue2 = scalar, F32, 1120, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1124, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1128, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1132, "", 1, 0 -desiredRpmLimit = scalar, S16, 1136, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1140, "", 1, 0 -globalSparkCounter = scalar, U32, 1144, "", 1, 0 -fuelingLoad = scalar, F32, 1148, "", 1, 0 -ignitionLoad = scalar, F32, 1152, "", 1, 0 -veTableYAxis = scalar, U16, 1156, "%", 0.01, 0 -; total TS size = 1160 -tpsFrom = scalar, F32, 1160 -tpsTo = scalar, F32, 1164 -deltaTps = scalar, F32, 1168 -extraFuel = scalar, F32, 1172, "", 1, 0 -valueFromTable = scalar, F32, 1176, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1180, [0:0] -isBelowDecelThreshold = bits, U32, 1180, [1:1] -isTimeToResetAccumulator = bits, U32, 1180, [2:2] -isFractionalEnrichment = bits, U32, 1180, [3:3] -belowEpsilon = bits, U32, 1180, [4:4] -tooShort = bits, U32, 1180, [5:5] -fractionalInjFuel = scalar, F32, 1184, "", 1, 0 -accumulatedValue = scalar, F32, 1188, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1192, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1196, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1200, "", 1, 0 -cycleCnt = scalar, S32, 1204, "", 1, 0 -; total TS size = 1208 -hwEventCounters1 = scalar, U32, 1208, "", 1, 0 -hwEventCounters2 = scalar, U32, 1212, "", 1, 0 -hwEventCounters3 = scalar, U32, 1216, "", 1, 0 -hwEventCounters4 = scalar, U32, 1220, "", 1, 0 -hwEventCounters5 = scalar, U32, 1224, "", 1, 0 -hwEventCounters6 = scalar, U32, 1228, "", 1, 0 -vvtCamCounter = scalar, U32, 1232, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1236, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1240, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1244, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1245, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1248, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1252, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1256, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1260, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1264, [0:0] -; total TS size = 1268 -crankSynchronizationCounter0 = scalar, U32, 1268, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1272, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1276, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1280, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1292, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1296, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1300, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1304, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1305, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1116, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1120, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1124, "", 1, 0 +desiredRpmLimit = scalar, S16, 1128, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1132, "", 1, 0 +globalSparkCounter = scalar, U32, 1136, "", 1, 0 +fuelingLoad = scalar, F32, 1140, "", 1, 0 +ignitionLoad = scalar, F32, 1144, "", 1, 0 +veTableYAxis = scalar, U16, 1148, "%", 0.01, 0 +; total TS size = 1152 +tpsFrom = scalar, F32, 1152 +tpsTo = scalar, F32, 1156 +deltaTps = scalar, F32, 1160 +extraFuel = scalar, F32, 1164, "", 1, 0 +valueFromTable = scalar, F32, 1168, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1172, [0:0] +isBelowDecelThreshold = bits, U32, 1172, [1:1] +isTimeToResetAccumulator = bits, U32, 1172, [2:2] +isFractionalEnrichment = bits, U32, 1172, [3:3] +belowEpsilon = bits, U32, 1172, [4:4] +tooShort = bits, U32, 1172, [5:5] +fractionalInjFuel = scalar, F32, 1176, "", 1, 0 +accumulatedValue = scalar, F32, 1180, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1184, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1188, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1192, "", 1, 0 +cycleCnt = scalar, S32, 1196, "", 1, 0 +; total TS size = 1200 +hwEventCounters1 = scalar, U32, 1200, "", 1, 0 +hwEventCounters2 = scalar, U32, 1204, "", 1, 0 +hwEventCounters3 = scalar, U32, 1208, "", 1, 0 +hwEventCounters4 = scalar, U32, 1212, "", 1, 0 +hwEventCounters5 = scalar, U32, 1216, "", 1, 0 +hwEventCounters6 = scalar, U32, 1220, "", 1, 0 +vvtCamCounter = scalar, U32, 1224, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1228, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1232, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1236, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1237, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1240, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1244, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1248, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1252, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1256, [0:0] +; total TS size = 1260 +crankSynchronizationCounter0 = scalar, U32, 1260, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1264, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1268, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1272, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1276, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1280, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1284, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1288, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1296, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1297, "", 1, 0 +; total TS size = 1300 +camResyncCounter = scalar, U08, 1300, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1304, [0:0] ; total TS size = 1308 -camResyncCounter = scalar, U08, 1308, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1312, [0:0] +wallFuelCorrection = scalar, F32, 1308, "", 1, 0 +wallFuel = scalar, F32, 1312, "", 1, 0 ; total TS size = 1316 -wallFuelCorrection = scalar, F32, 1316, "", 1, 0 -wallFuel = scalar, F32, 1320, "", 1, 0 -; total TS size = 1324 -idleState = bits, S32, 1324, [0:2], "not important" -currentIdlePosition = scalar, F32, 1328 -baseIdlePosition = scalar, F32, 1332 -idleClosedLoop = scalar, F32, 1336 -iacByTpsTaper = scalar, F32, 1340 -throttlePedalUpState = scalar, S32, 1344, "", 1, 0 -mightResetPid = bits, U32, 1348, [0:0] -shouldResetPid = bits, U32, 1348, [1:1] -wasResetPid = bits, U32, 1348, [2:2] -mustResetPid = bits, U32, 1348, [3:3] -isCranking = bits, U32, 1348, [4:4] -isIacTableForCoasting = bits, U32, 1348, [5:5] -notIdling = bits, U32, 1348, [6:6] -needReset = bits, U32, 1348, [7:7] -isInDeadZone = bits, U32, 1348, [8:8] -isBlipping = bits, U32, 1348, [9:9] -useClosedLoop = bits, U32, 1348, [10:10] -badTps = bits, U32, 1348, [11:11] -looksLikeRunning = bits, U32, 1348, [12:12] -looksLikeCoasting = bits, U32, 1348, [13:13] -looksLikeCrankToIdle = bits, U32, 1348, [14:14] -isIdleCoasting = bits, U32, 1348, [15:15] -isIdleClosedLoop = bits, U32, 1348, [16:16] -idleTarget = scalar, S32, 1352, "", 1, 0 -targetRpmByClt = scalar, S32, 1356, "", 1, 0 -targetRpmAc = scalar, S32, 1360, "", 1, 0 -iacByRpmTaper = scalar, F32, 1364 -luaAdd = scalar, F32, 1368 -; total TS size = 1372 -idlePosition0 = scalar, F32, 1372, "per", 1,0 -trim0 = scalar, F32, 1376, "", 1, 0 -luaAdjustment0 = scalar, F32, 1380, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1384, "per", 1,0 -etbFeedForward0 = scalar, F32, 1388 -etbIntegralError0 = scalar, F32, 1392, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1396, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1400, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1404, [0:0] -jamDetected0 = bits, U32, 1404, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1408, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1412, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1416, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1418, "count", 1,0 -etbErrorCode0 = scalar, S08, 1420, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1421, "", 1, 0 -jamTimer0 = scalar, U16, 1422, "sec", 0.01, 0 -; total TS size = 1424 -faultCode0 = scalar, U08, 1424, "", 1, 0 -heaterDuty0 = scalar, U08, 1425, "%", 1, 0 -pumpDuty0 = scalar, U08, 1426, "%", 1, 0 -tempC0 = scalar, U16, 1428, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1430, "V", 0.001, 0 -esr0 = scalar, U16, 1432, "ohm", 1, 0 -; total TS size = 1436 -dcOutput0 = scalar, F32, 1436, "per", 1,0 -isEnabled0_int = scalar, U08, 1440, "per", 1,0 -isEnabled0 = bits, U32, 1444, [0:0] +idleState = bits, S32, 1316, [0:2], "not important" +currentIdlePosition = scalar, F32, 1320 +baseIdlePosition = scalar, F32, 1324 +idleClosedLoop = scalar, F32, 1328 +iacByTpsTaper = scalar, F32, 1332 +throttlePedalUpState = scalar, S32, 1336, "", 1, 0 +mightResetPid = bits, U32, 1340, [0:0] +shouldResetPid = bits, U32, 1340, [1:1] +wasResetPid = bits, U32, 1340, [2:2] +mustResetPid = bits, U32, 1340, [3:3] +isCranking = bits, U32, 1340, [4:4] +isIacTableForCoasting = bits, U32, 1340, [5:5] +notIdling = bits, U32, 1340, [6:6] +needReset = bits, U32, 1340, [7:7] +isInDeadZone = bits, U32, 1340, [8:8] +isBlipping = bits, U32, 1340, [9:9] +useClosedLoop = bits, U32, 1340, [10:10] +badTps = bits, U32, 1340, [11:11] +looksLikeRunning = bits, U32, 1340, [12:12] +looksLikeCoasting = bits, U32, 1340, [13:13] +looksLikeCrankToIdle = bits, U32, 1340, [14:14] +isIdleCoasting = bits, U32, 1340, [15:15] +isIdleClosedLoop = bits, U32, 1340, [16:16] +idleTarget = scalar, S32, 1344, "", 1, 0 +targetRpmByClt = scalar, S32, 1348, "", 1, 0 +targetRpmAc = scalar, S32, 1352, "", 1, 0 +iacByRpmTaper = scalar, F32, 1356 +luaAdd = scalar, F32, 1360 +; total TS size = 1364 +idlePosition0 = scalar, F32, 1364, "per", 1,0 +trim0 = scalar, F32, 1368, "", 1, 0 +luaAdjustment0 = scalar, F32, 1372, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1376, "per", 1,0 +etbFeedForward0 = scalar, F32, 1380 +etbIntegralError0 = scalar, F32, 1384, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1388, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1392, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1396, [0:0] +jamDetected0 = bits, U32, 1396, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1400, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1404, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1408, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1410, "count", 1,0 +etbErrorCode0 = scalar, S08, 1412, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1413, "", 1, 0 +jamTimer0 = scalar, U16, 1414, "sec", 0.01, 0 +; total TS size = 1416 +faultCode0 = scalar, U08, 1416, "", 1, 0 +heaterDuty0 = scalar, U08, 1417, "%", 1, 0 +pumpDuty0 = scalar, U08, 1418, "%", 1, 0 +tempC0 = scalar, U16, 1420, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1422, "V", 0.001, 0 +esr0 = scalar, U16, 1424, "ohm", 1, 0 +; total TS size = 1428 +dcOutput0 = scalar, F32, 1428, "per", 1,0 +isEnabled0_int = scalar, U08, 1432, "per", 1,0 +isEnabled0 = bits, U32, 1436, [0:0] +; total TS size = 1440 +value0 = scalar, U16, 1440, "value", 1,0 +value1 = scalar, U16, 1442, "value", 1,0 +errorRate = scalar, F32, 1444, "ratio", 1,0 ; total TS size = 1448 -value0 = scalar, U16, 1448, "value", 1,0 -value1 = scalar, U16, 1450, "value", 1,0 -errorRate = scalar, F32, 1452, "ratio", 1,0 -; total TS size = 1456 -vvtTarget = scalar, U16, 1456, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1458, "%", 0.5, 0 +vvtTarget = scalar, U16, 1448, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1450, "%", 0.5, 0 +; total TS size = 1452 +lambdaCurrentlyGood = bits, U32, 1452, [0:0] +lambdaMonitorCut = bits, U32, 1452, [1:1] +lambdaTimeSinceGood = scalar, U16, 1456, "sec", 0.01, 0 ; total TS size = 1460 -lambdaCurrentlyGood = bits, U32, 1460, [0:0] -lambdaMonitorCut = bits, U32, 1460, [1:1] -lambdaTimeSinceGood = scalar, U16, 1464, "sec", 0.01, 0 -; total TS size = 1468 time = { timeNow } @@ -5421,8 +5419,6 @@ entry = luaDigitalState1, "luaDigitalState1", int, "%d" entry = luaDigitalState2, "luaDigitalState2", int, "%d" entry = luaDigitalState3, "luaDigitalState3", int, "%d" entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" entry = luaSoftSparkSkip, "luaSoftSparkSkip", float, "%.3f" entry = luaHardSparkSkip, "luaHardSparkSkip", float, "%.3f" entry = tractionControlSparkSkip, "tractionControlSparkSkip", float, "%.3f" @@ -6406,19 +6402,16 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = smartChipAliveCounter graphLine = startStopStateToggleCounter - graphLine = egtValue1 - graphLine = egtValue2 - liveGraph = engine_state_6_Graph, "Graph", South graphLine = luaSoftSparkSkip graphLine = luaHardSparkSkip + liveGraph = engine_state_6_Graph, "Graph", South graphLine = tractionControlSparkSkip graphLine = desiredRpmLimit - liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = globalSparkCounter + liveGraph = engine_state_7_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad - liveGraph = engine_state_8_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java index 53f2e7d723..3e650fd567 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/dc_motors.txt Sat Mar 09 11:25:42 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/dc_motors.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -173,10 +173,10 @@ public class DcMotors { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1436); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1436); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1436); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1436); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1428); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1428); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1428); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1428); public static final Field[] VALUES = { DCOUTPUT0, ISENABLED0_INT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index 77ce0ed85e..575c2865d6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sat Mar 09 11:25:42 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -173,23 +173,23 @@ public class ElectronicThrottle { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1372); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1372); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1372); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1372); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1372); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1372); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1372); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1372); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1372); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1372); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1372); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1372); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1372); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1372); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1372); - public static final Field TCETBDROP = Field.create("TCETBDROP", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1372); - public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1372); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1364); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1364); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1364); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1364); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1364); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1364); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1364); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1364); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1364); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1364); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1364); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1364); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1364); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1364); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1364); + public static final Field TCETBDROP = Field.create("TCETBDROP", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1364); + public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1364); public static final Field[] VALUES = { IDLEPOSITION, TRIM, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 446705b4d0..775477fd4d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Sat Mar 09 11:25:42 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/engine_state.txt Mon Mar 11 20:56:12 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -207,19 +207,17 @@ public class EngineState { public static final Field LUADIGITALSTATE2 = Field.create("LUADIGITALSTATE2", 52, FieldType.BIT, 6).setBaseOffset(1056); public static final Field LUADIGITALSTATE3 = Field.create("LUADIGITALSTATE3", 52, FieldType.BIT, 7).setBaseOffset(1056); public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 56, FieldType.INT).setScale(1.0).setBaseOffset(1056); - public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 60, FieldType.FLOAT).setBaseOffset(1056); - public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 64, FieldType.FLOAT).setBaseOffset(1056); - public static final Field LUASOFTSPARKSKIP = Field.create("LUASOFTSPARKSKIP", 68, FieldType.FLOAT).setBaseOffset(1056); - public static final Field LUAHARDSPARKSKIP = Field.create("LUAHARDSPARKSKIP", 72, FieldType.FLOAT).setBaseOffset(1056); - public static final Field TRACTIONCONTROLSPARKSKIP = Field.create("TRACTIONCONTROLSPARKSKIP", 76, FieldType.FLOAT).setBaseOffset(1056); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 80, FieldType.INT16).setScale(1.0).setBaseOffset(1056); - public static final Field ALIGNMENTFILL_AT_82 = Field.create("ALIGNMENTFILL_AT_82", 82, FieldType.INT8).setScale(1.0).setBaseOffset(1056); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 84, FieldType.INT).setScale(1.0).setBaseOffset(1056); - public static final Field GLOBALSPARKCOUNTER = Field.create("GLOBALSPARKCOUNTER", 88, FieldType.INT).setScale(1.0).setBaseOffset(1056); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 92, FieldType.FLOAT).setBaseOffset(1056); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 96, FieldType.FLOAT).setBaseOffset(1056); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 100, FieldType.INT16).setScale(0.01).setBaseOffset(1056); - public static final Field ALIGNMENTFILL_AT_102 = Field.create("ALIGNMENTFILL_AT_102", 102, FieldType.INT8).setScale(1.0).setBaseOffset(1056); + public static final Field LUASOFTSPARKSKIP = Field.create("LUASOFTSPARKSKIP", 60, FieldType.FLOAT).setBaseOffset(1056); + public static final Field LUAHARDSPARKSKIP = Field.create("LUAHARDSPARKSKIP", 64, FieldType.FLOAT).setBaseOffset(1056); + public static final Field TRACTIONCONTROLSPARKSKIP = Field.create("TRACTIONCONTROLSPARKSKIP", 68, FieldType.FLOAT).setBaseOffset(1056); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 72, FieldType.INT16).setScale(1.0).setBaseOffset(1056); + public static final Field ALIGNMENTFILL_AT_74 = Field.create("ALIGNMENTFILL_AT_74", 74, FieldType.INT8).setScale(1.0).setBaseOffset(1056); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 76, FieldType.INT).setScale(1.0).setBaseOffset(1056); + public static final Field GLOBALSPARKCOUNTER = Field.create("GLOBALSPARKCOUNTER", 80, FieldType.INT).setScale(1.0).setBaseOffset(1056); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 84, FieldType.FLOAT).setBaseOffset(1056); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 88, FieldType.FLOAT).setBaseOffset(1056); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 92, FieldType.INT16).setScale(0.01).setBaseOffset(1056); + public static final Field ALIGNMENTFILL_AT_94 = Field.create("ALIGNMENTFILL_AT_94", 94, FieldType.INT8).setScale(1.0).setBaseOffset(1056); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -255,18 +253,16 @@ public class EngineState { LUADIGITALSTATE2, LUADIGITALSTATE3, STARTSTOPSTATETOGGLECOUNTER, - EGTVALUE1, - EGTVALUE2, LUASOFTSPARKSKIP, LUAHARDSPARKSKIP, TRACTIONCONTROLSPARKSKIP, DESIREDRPMLIMIT, - ALIGNMENTFILL_AT_82, + ALIGNMENTFILL_AT_74, FUELINJECTIONCOUNTER, GLOBALSPARKCOUNTER, FUELINGLOAD, IGNITIONLOAD, VETABLEYAXIS, - ALIGNMENTFILL_AT_102, + ALIGNMENTFILL_AT_94, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 9c77bd684d..a64df88538 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 00:22:28 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Mar 11 20:57:35 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1124,7 +1124,6 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; - public static final int SIGNATURE_HASH = 479029193; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1371,11 +1370,11 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2024.03.11.f407-discovery.479029193"; + public static final String TS_SIGNATURE = "rusEFI master.2024.03.11.f407-discovery.3631402837"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1468; + public static final int TS_TOTAL_OUTPUT_SIZE = 1460; public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; public static final int TS_TRIGGER_SCOPE_DISABLE = 5; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index b13f881479..cfeafab6a6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/idle_state.txt Sat Mar 09 11:25:42 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/idle_state.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -173,34 +173,34 @@ public class IdleState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1324); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1324); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1324); - public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1324); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1324); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1324); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1324); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1324); - public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1324); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1324); - public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1324); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1324); - public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1324); - public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1324); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1324); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1324); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1324); - public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1324); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1324); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1324); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1324); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1324); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1324); - public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1324); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1324); - public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1324); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1324); - public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1324); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1316); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1316); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1316); + public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1316); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1316); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1316); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1316); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1316); + public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1316); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1316); + public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1316); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1316); + public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1316); + public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1316); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1316); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1316); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1316); + public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1316); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1316); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1316); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1316); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1316); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1316); + public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1316); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1316); + public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1316); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1316); + public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1316); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java index 91384d4876..567d5959f7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/math/lambda_monitor.txt Tue Mar 05 01:56:09 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/math/lambda_monitor.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LambdaMonitor { - public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1460); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1460); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1460); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1460); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1452); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1452); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1452); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1452); public static final Field[] VALUES = { LAMBDACURRENTLYGOOD, LAMBDAMONITORCUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java index 35245eea15..dc97639f00 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/sensors/sent_state.txt Sat Mar 09 11:25:42 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/sensors/sent_state.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -173,9 +173,9 @@ public class SentState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1448); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1448); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1448); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1440); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1440); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1440); public static final Field[] VALUES = { VALUE0, VALUE1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java index 8c9cfafd9c..5a9e3ba6d9 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/tps_accel_state.txt Sat Mar 09 11:25:42 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/tps_accel_state.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -173,23 +173,23 @@ public class TpsAccelState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1160); - public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1160); - public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1160); - public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1160); - public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1160); - public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1160); - public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1160); - public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1160); - public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1160); - public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1160); - public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1160); - public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1160); - public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1160); - public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1160); - public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1160); - public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1160); - public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1160); + public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1152); + public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1152); + public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1152); + public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1152); + public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1152); + public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1152); + public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1152); + public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1152); + public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1152); + public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1152); + public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1152); + public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1152); + public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1152); + public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1152); + public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1152); + public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1152); + public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1152); public static final Field[] VALUES = { TPSFROM, TPSTO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index 0d00ddbaf1..b59fec078c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,30 +1,30 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue Mar 05 01:56:09 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerCentral { public static final int HW_EVENT_TYPES = 6; - public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1208); - public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1208); - public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1208); - public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1208); - public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1208); - public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1208); - public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1208); - public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1208); - public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1208); - public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1208); - public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1208); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1208); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1208); - public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1208); - public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1208); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1208); - public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1208); - public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1208); + public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1200); + public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1200); + public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1200); + public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1200); + public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1200); + public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1200); + public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1200); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1200); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1200); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1200); + public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1200); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1200); + public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1200); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1200); + public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1200); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1200); + public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1200); + public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1200); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 1aaa799d7a..1185070fb4 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state.txt Sat Mar 09 11:25:42 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -173,18 +173,18 @@ public class TriggerState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1268); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1268); - public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1268); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1268); - public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1268); - public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1268); - public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1268); - public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1268); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1268); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1268); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1268); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1268); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1260); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1260); + public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1260); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1260); + public static final Field VVTTOOTHPOSITION1 = Field.create("VVTTOOTHPOSITION1", 16, FieldType.FLOAT).setBaseOffset(1260); + public static final Field VVTTOOTHPOSITION2 = Field.create("VVTTOOTHPOSITION2", 20, FieldType.FLOAT).setBaseOffset(1260); + public static final Field VVTTOOTHPOSITION3 = Field.create("VVTTOOTHPOSITION3", 24, FieldType.FLOAT).setBaseOffset(1260); + public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1260); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1260); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1260); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1260); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1260); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index d1837e718e..3831b06bf6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sat Mar 09 11:25:42 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -173,9 +173,9 @@ public class TriggerStatePrimary { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1308); - public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1308); - public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1308); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1300); + public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1300); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1300); public static final Field[] VALUES = { CAMRESYNCCOUNTER, ALIGNMENTFILL_AT_1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java index a4aeefffcb..7db21217a2 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java @@ -1,14 +1,14 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/vvt.txt Tue Mar 05 01:56:09 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/vvt.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class VvtState { - public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1456); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1456); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1456); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1448); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1448); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1448); public static final Field[] VALUES = { VVTTARGET, VVTOUTPUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index a2db44796a..a4d0eb1979 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,13 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Tue Mar 05 01:56:09 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1316); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1316); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1308); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1308); public static final Field[] VALUES = { WALLFUELCORRECTION, WALLFUEL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index e782946f1b..36ced19940 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/sensors//wideband_state.txt Tue Mar 05 01:56:09 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/sensors//wideband_state.txt Mon Mar 11 20:56:13 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1424); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1424); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1424); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1424); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1424); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1424); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1424); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1424); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1416); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1416); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1416); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1416); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1416); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1416); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1416); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1416); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,