diff --git a/firmware/controllers/actuators/ac_control_generated.h b/firmware/controllers/actuators/ac_control_generated.h index e69f9ca6b5..629f0b62d4 100644 --- a/firmware/controllers/actuators/ac_control_generated.h +++ b/firmware/controllers/actuators/ac_control_generated.h @@ -74,13 +74,9 @@ struct ac_control_s { bool unusedBit_0_30 : 1 {}; // offset 0 bit 31 bool unusedBit_0_31 : 1 {}; - // AC latest activity // offset 4 - int latest_usage_ac_control = (int)0; - // offset 8 int acSwitchLastChangeTimeMs = (int)0; }; -static_assert(sizeof(ac_control_s) == 12); -static_assert(offsetof(ac_control_s, latest_usage_ac_control) == 4); -static_assert(offsetof(ac_control_s, acSwitchLastChangeTimeMs) == 8); +static_assert(sizeof(ac_control_s) == 8); +static_assert(offsetof(ac_control_s, acSwitchLastChangeTimeMs) == 4); diff --git a/firmware/tunerstudio/generated/fome_alphax-2chan.ini b/firmware/tunerstudio/generated/fome_alphax-2chan.ini index 8df048ed0d..92a65b4dea 100644 --- a/firmware/tunerstudio/generated/fome_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.alphax-2chan.62653975" + signature = "rusEFI (FOME) master.2024.08.13.alphax-2chan.744020616" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.alphax-2chan.62653975" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.alphax-2chan.744020616" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5724,7 +5722,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_alphax-4chan.ini b/firmware/tunerstudio/generated/fome_alphax-4chan.ini index a0a11d2b56..f3749bdb29 100644 --- a/firmware/tunerstudio/generated/fome_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.alphax-4chan.2306081910" + signature = "rusEFI (FOME) master.2024.08.13.alphax-4chan.2794510569" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.alphax-4chan.2306081910" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.alphax-4chan.2794510569" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_alphax-8chan.ini b/firmware/tunerstudio/generated/fome_alphax-8chan.ini index 7d66aca907..ffc4318d21 100644 --- a/firmware/tunerstudio/generated/fome_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.alphax-8chan.4056875663" + signature = "rusEFI (FOME) master.2024.08.13.alphax-8chan.3727416848" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.alphax-8chan.4056875663" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.alphax-8chan.3727416848" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_atlas.ini b/firmware/tunerstudio/generated/fome_atlas.ini index e4a643ec0a..e468ae5d5d 100644 --- a/firmware/tunerstudio/generated/fome_atlas.ini +++ b/firmware/tunerstudio/generated/fome_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.atlas.1530394979" + signature = "rusEFI (FOME) master.2024.08.13.atlas.1959994876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.atlas.1530394979" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.atlas.1959994876" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5726,7 +5724,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_core48.ini b/firmware/tunerstudio/generated/fome_core48.ini index 9e31912459..639bc9929b 100644 --- a/firmware/tunerstudio/generated/fome_core48.ini +++ b/firmware/tunerstudio/generated/fome_core48.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.core48.968690085" + signature = "rusEFI (FOME) master.2024.08.13.core48.374986042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.core48.968690085" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.core48.374986042" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5728,7 +5726,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_core8.ini b/firmware/tunerstudio/generated/fome_core8.ini index 455c6c8d9c..23c322407e 100644 --- a/firmware/tunerstudio/generated/fome_core8.ini +++ b/firmware/tunerstudio/generated/fome_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.core8.516164710" + signature = "rusEFI (FOME) master.2024.08.13.core8.824234233" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.core8.516164710" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.core8.824234233" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5728,7 +5726,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_f407-discovery.ini b/firmware/tunerstudio/generated/fome_f407-discovery.ini index db2b4ec837..c207bd8739 100644 --- a/firmware/tunerstudio/generated/fome_f407-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.f407-discovery.3350036656" + signature = "rusEFI (FOME) master.2024.08.13.f407-discovery.3897121839" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.f407-discovery.3350036656" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.f407-discovery.3897121839" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5728,7 +5726,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_f429-discovery.ini b/firmware/tunerstudio/generated/fome_f429-discovery.ini index 063567cf28..d601c0e46d 100644 --- a/firmware/tunerstudio/generated/fome_f429-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.f429-discovery.652411344" + signature = "rusEFI (FOME) master.2024.08.13.f429-discovery.151510351" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.f429-discovery.652411344" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.f429-discovery.151510351" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5726,7 +5724,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_frankenso_na6.ini b/firmware/tunerstudio/generated/fome_frankenso_na6.ini index 8d37431de1..f27664ef1b 100644 --- a/firmware/tunerstudio/generated/fome_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/fome_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.frankenso_na6.78766362" + signature = "rusEFI (FOME) master.2024.08.13.frankenso_na6.727006597" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.frankenso_na6.78766362" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.frankenso_na6.727006597" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5726,7 +5724,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_harley81.ini b/firmware/tunerstudio/generated/fome_harley81.ini index ad72e9bd1f..a13e7287c2 100644 --- a/firmware/tunerstudio/generated/fome_harley81.ini +++ b/firmware/tunerstudio/generated/fome_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.harley81.2943760810" + signature = "rusEFI (FOME) master.2024.08.13.harley81.2157110581" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.harley81.2943760810" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.harley81.2157110581" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini index 5895876702..fd3e9a8b63 100644 --- a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen-gm-e67.1334456067" + signature = "rusEFI (FOME) master.2024.08.13.hellen-gm-e67.1617884060" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen-gm-e67.1334456067" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen-gm-e67.1617884060" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini index 332d6c2983..84f4426175 100644 --- a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen-honda-k.3558596930" + signature = "rusEFI (FOME) master.2024.08.13.hellen-honda-k.4227808733" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen-honda-k.3558596930" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen-honda-k.4227808733" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen-nb1.ini b/firmware/tunerstudio/generated/fome_hellen-nb1.ini index 65586d96c7..4b78c4cc86 100644 --- a/firmware/tunerstudio/generated/fome_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/fome_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen-nb1.3519287404" + signature = "rusEFI (FOME) master.2024.08.13.hellen-nb1.4263562483" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen-nb1.3519287404" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen-nb1.4263562483" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen121nissan.ini b/firmware/tunerstudio/generated/fome_hellen121nissan.ini index b16e770c19..07d814ae77 100644 --- a/firmware/tunerstudio/generated/fome_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/fome_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen121nissan.2703211558" + signature = "rusEFI (FOME) master.2024.08.13.hellen121nissan.2398838969" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen121nissan.2703211558" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen121nissan.2398838969" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen121vag.ini b/firmware/tunerstudio/generated/fome_hellen121vag.ini index 01bdfedca6..b6e2b90324 100644 --- a/firmware/tunerstudio/generated/fome_hellen121vag.ini +++ b/firmware/tunerstudio/generated/fome_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen121vag.219984885" + signature = "rusEFI (FOME) master.2024.08.13.hellen121vag.586706794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen121vag.219984885" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen121vag.586706794" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen128.ini b/firmware/tunerstudio/generated/fome_hellen128.ini index 6b4695961d..c9d6f08070 100644 --- a/firmware/tunerstudio/generated/fome_hellen128.ini +++ b/firmware/tunerstudio/generated/fome_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen128.2792448119" + signature = "rusEFI (FOME) master.2024.08.13.hellen128.2308291816" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen128.2792448119" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen128.2308291816" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini index 3f0d20665f..66dcc3f32d 100644 --- a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen154hyundai.847659158" + signature = "rusEFI (FOME) master.2024.08.13.hellen154hyundai.493001737" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen154hyundai.847659158" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen154hyundai.493001737" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen72.ini b/firmware/tunerstudio/generated/fome_hellen72.ini index b33cdd61b3..6be8c1cd10 100644 --- a/firmware/tunerstudio/generated/fome_hellen72.ini +++ b/firmware/tunerstudio/generated/fome_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen72.3612842087" + signature = "rusEFI (FOME) master.2024.08.13.hellen72.4172498168" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen72.3612842087" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen72.4172498168" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen81.ini b/firmware/tunerstudio/generated/fome_hellen81.ini index e9455ea7b8..4beff0ef40 100644 --- a/firmware/tunerstudio/generated/fome_hellen81.ini +++ b/firmware/tunerstudio/generated/fome_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen81.2078139109" + signature = "rusEFI (FOME) master.2024.08.13.hellen81.1413037690" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen81.2078139109" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen81.1413037690" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5725,7 +5723,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellen88bmw.ini b/firmware/tunerstudio/generated/fome_hellen88bmw.ini index 6bca79e5ca..29f8c6fc6e 100644 --- a/firmware/tunerstudio/generated/fome_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/fome_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellen88bmw.2112222678" + signature = "rusEFI (FOME) master.2024.08.13.hellen88bmw.1375807817" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellen88bmw.2112222678" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellen88bmw.1375807817" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellenNA6.ini b/firmware/tunerstudio/generated/fome_hellenNA6.ini index c972f29c01..5653e5ac8e 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA6.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellenNA6.705149943" + signature = "rusEFI (FOME) master.2024.08.13.hellenNA6.98789224" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellenNA6.705149943" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellenNA6.98789224" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini index bfba8de2bd..7ebcd33567 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.hellenNA8_96.2314680295" + signature = "rusEFI (FOME) master.2024.08.13.hellenNA8_96.2786323320" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.hellenNA8_96.2314680295" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.hellenNA8_96.2786323320" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5727,7 +5725,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_mre_f4.ini b/firmware/tunerstudio/generated/fome_mre_f4.ini index 39f6e2bf9e..932c3456ed 100644 --- a/firmware/tunerstudio/generated/fome_mre_f4.ini +++ b/firmware/tunerstudio/generated/fome_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.mre_f4.3245171816" + signature = "rusEFI (FOME) master.2024.08.13.mre_f4.4002003191" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.mre_f4.3245171816" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.mre_f4.4002003191" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4896,7 +4895,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5729,7 +5727,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_mre_f7.ini b/firmware/tunerstudio/generated/fome_mre_f7.ini index 31094ff860..e61651586d 100644 --- a/firmware/tunerstudio/generated/fome_mre_f7.ini +++ b/firmware/tunerstudio/generated/fome_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.mre_f7.3245171816" + signature = "rusEFI (FOME) master.2024.08.13.mre_f7.4002003191" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.mre_f7.3245171816" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.mre_f7.4002003191" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4896,7 +4895,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5729,7 +5727,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_prometheus_405.ini b/firmware/tunerstudio/generated/fome_prometheus_405.ini index 4c2cb42f34..51cca95ac5 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_405.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.prometheus_405.376949824" + signature = "rusEFI (FOME) master.2024.08.13.prometheus_405.965939423" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.prometheus_405.376949824" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.prometheus_405.965939423" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5721,7 +5719,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_prometheus_469.ini b/firmware/tunerstudio/generated/fome_prometheus_469.ini index 80e3751fe6..d0ced04d5a 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_469.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.prometheus_469.376949824" + signature = "rusEFI (FOME) master.2024.08.13.prometheus_469.965939423" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.prometheus_469.376949824" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.prometheus_469.965939423" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5721,7 +5719,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_proteus_f4.ini b/firmware/tunerstudio/generated/fome_proteus_f4.ini index 2aad5475fa..1b12ca5708 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f4.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.proteus_f4.1449391190" + signature = "rusEFI (FOME) master.2024.08.13.proteus_f4.2038900937" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.proteus_f4.1449391190" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.proteus_f4.2038900937" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 25012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5723,7 +5721,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_proteus_f7.ini b/firmware/tunerstudio/generated/fome_proteus_f7.ini index 0a54953d9c..aa3890241d 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.proteus_f7.1449391190" + signature = "rusEFI (FOME) master.2024.08.13.proteus_f7.2038900937" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.proteus_f7.1449391190" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.proteus_f7.2038900937" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 25012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5723,7 +5721,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_proteus_h7.ini b/firmware/tunerstudio/generated/fome_proteus_h7.ini index 620a1c4a6f..35dc76d1a4 100644 --- a/firmware/tunerstudio/generated/fome_proteus_h7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.proteus_h7.1449391190" + signature = "rusEFI (FOME) master.2024.08.13.proteus_h7.2038900937" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.proteus_h7.1449391190" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.proteus_h7.2038900937" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 25012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5723,7 +5721,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_small-can-board.ini b/firmware/tunerstudio/generated/fome_small-can-board.ini index 6b60a8cf56..f351f6991d 100644 --- a/firmware/tunerstudio/generated/fome_small-can-board.ini +++ b/firmware/tunerstudio/generated/fome_small-can-board.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.small-can-board.3465483854" + signature = "rusEFI (FOME) master.2024.08.13.small-can-board.3781937873" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.small-can-board.3465483854" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.small-can-board.3781937873" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 38012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5725,7 +5723,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini index 10c1dbeb60..20530200e4 100644 --- a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.08.13.tdg-pdm8.2890739186" + signature = "rusEFI (FOME) master.2024.08.13.tdg-pdm8.2208952685" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.08.13.tdg-pdm8.2890739186" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.08.13.tdg-pdm8.2208952685" ; 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 @@ -2226,7 +2226,7 @@ minimumOilPressureValues = array, U08, 21012, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1388 + ochBlockSize = 1384 ; ; see TunerStudioOutputChannels struct @@ -2809,174 +2809,173 @@ engineTooHot = bits, U32, 988, [5:5] tpsTooHigh = bits, U32, 988, [6:6] isDisabledByLua = bits, U32, 988, [7:7] acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 992, "", 1, 0 +; total TS size = 996 +cranking = bits, U32, 996, [0:0] +notRunning = bits, U32, 996, [1:1] +disabledWhileEngineStopped = bits, U32, 996, [2:2] +brokenClt = bits, U32, 996, [3:3] +enabledForAc = bits, U32, 996, [4:4] +hot = bits, U32, 996, [5:5] +cold = bits, U32, 996, [6:6] ; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] +isPrime = bits, U32, 1000, [0:0] +engineTurnedRecently = bits, U32, 1000, [1:1] +isFuelPumpOn = bits, U32, 1000, [2:2] +ignitionOn = bits, U32, 1000, [3:3] ; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] +isBenchTest = bits, U32, 1004, [0:0] +hasIgnitionVoltage = bits, U32, 1004, [1:1] +mainRelayState = bits, U32, 1004, [2:2] +delayedShutoffRequested = bits, U32, 1004, [3:3] ; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 1094, "deg", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -luaAddRpm = scalar, F32, 1276 -; total TS size = 1280 -idlePosition = scalar, F32, 1280, "per", 1, 0 -trim = scalar, F32, 1284, "", 1, 0 -luaAdjustment = scalar, F32, 1288, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 -etbFeedForward = scalar, F32, 1296 -etbIntegralError = scalar, F32, 1300, "", 1, 0 -etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 -etbRevLimitActive = bits, U32, 1312, [0:0] -jamDetected = bits, U32, 1312, [1:1] -etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 -etbDutyAverage = scalar, F32, 1320, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 -etbErrorCode = scalar, S08, 1328, "", 1, 0 -jamTimer = scalar, U16, 1330, "sec", 0.01, 0 -; total TS size = 1332 -faultCode = scalar, U08, 1332, "", 1, 0 -heaterDuty = scalar, U08, 1333, "%", 1, 0 -pumpDuty = scalar, U08, 1334, "%", 1, 0 -tempC = scalar, U16, 1336, "C", 1, 0 -nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 -esr = scalar, U16, 1340, "ohm", 1, 0 -; total TS size = 1344 -dcOutput0 = scalar, F32, 1344, "per", 1, 0 -isEnabled0_int = scalar, U08, 1348, "per", 1, 0 -isEnabled0 = bits, U32, 1352, [0:0] -; total TS size = 1356 -value0 = scalar, U16, 1356, "value", 1, 0 -value1 = scalar, U16, 1358, "value", 1, 0 -errorRate = scalar, F32, 1360, "ratio", 1, 0 -; total TS size = 1364 -throttleUseWotModel = bits, U32, 1364, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 1008, "g", 1, 0 +lua_fuelMult = scalar, F32, 1012, "", 1, 0 +lua_clutchUpState = bits, U32, 1016, [0:0] +lua_brakePedalState = bits, U32, 1016, [1:1] +lua_acRequestState = bits, U32, 1016, [2:2] +lua_luaDisableEtb = bits, U32, 1016, [3:3] +lua_luaIgnCut = bits, U32, 1016, [4:4] +sd_tCharge = scalar, S16, 1020, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1024, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1028, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1032, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1036, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1040, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1044, "", 1, 0 +hellenBoardId = scalar, S16, 1048, "id", 1, 0 +clutchUpState = bits, U32, 1052, [0:0] +clutchDownState = bits, U32, 1052, [1:1] +brakePedalState = bits, U32, 1052, [2:2] +startStopState = bits, U32, 1052, [3:3] +startStopStateToggleCounter = scalar, U32, 1056, "", 1, 0 +egtValue1 = scalar, F32, 1060, "", 1, 0 +egtValue2 = scalar, F32, 1064, "", 1, 0 +desiredRpmLimit = scalar, S16, 1068, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1072, "", 1, 0 +sparkCounter = scalar, U32, 1076, "", 1, 0 +fuelingLoad = scalar, F32, 1080, "", 1, 0 +ignitionLoad = scalar, F32, 1084, "", 1, 0 +veTableYAxis = scalar, U16, 1088, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 1090, "deg", 0.01, 0 +; total TS size = 1092 +tpsFrom = scalar, F32, 1092 +tpsTo = scalar, F32, 1096 +deltaTps = scalar, F32, 1100 +extraFuel = scalar, F32, 1104, "", 1, 0 +valueFromTable = scalar, F32, 1108, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1112, [0:0] +isBelowDecelThreshold = bits, U32, 1112, [1:1] +isTimeToResetAccumulator = bits, U32, 1112, [2:2] +isFractionalEnrichment = bits, U32, 1112, [3:3] +belowEpsilon = bits, U32, 1112, [4:4] +tooShort = bits, U32, 1112, [5:5] +fractionalInjFuel = scalar, F32, 1116, "", 1, 0 +accumulatedValue = scalar, F32, 1120, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1124, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1128, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1132, "", 1, 0 +cycleCnt = scalar, S32, 1136, "", 1, 0 +; total TS size = 1140 +hwEventCounters1 = scalar, U32, 1140, "", 1, 0 +hwEventCounters2 = scalar, U32, 1144, "", 1, 0 +hwEventCounters3 = scalar, U32, 1148, "", 1, 0 +hwEventCounters4 = scalar, U32, 1152, "", 1, 0 +hwEventCounters5 = scalar, U32, 1156, "", 1, 0 +hwEventCounters6 = scalar, U32, 1160, "", 1, 0 +vvtCamCounter = scalar, U32, 1164, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1168, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1172, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1176, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1177, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1180, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1184, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1188, "", 1, 0 +; total TS size = 1192 +crankSynchronizationCounter = scalar, U32, 1192, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1196, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1200, "", 1, 0 +triggerStateIndex = scalar, U08, 1204, "", 1, 0 +vvtCounter = scalar, U08, 1205, "", 1, 0 +vvtStateIndex = scalar, U08, 1206, "", 1, 0 +; total TS size = 1208 +camResyncCounter = scalar, U08, 1208, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1212, [0:0] +; total TS size = 1216 +wallFuelCorrection = scalar, F32, 1216, "", 1, 0 +wallFuel = scalar, F32, 1220, "", 1, 0 +; total TS size = 1224 +idleState = bits, S32, 1224, [0:2], "not important" +currentIdlePosition = scalar, F32, 1228 +baseIdlePosition = scalar, F32, 1232 +idleClosedLoop = scalar, F32, 1236 +iacByTpsTaper = scalar, F32, 1240 +throttlePedalUpState = scalar, S32, 1244, "", 1, 0 +mightResetPid = bits, U32, 1248, [0:0] +shouldResetPid = bits, U32, 1248, [1:1] +wasResetPid = bits, U32, 1248, [2:2] +mustResetPid = bits, U32, 1248, [3:3] +isCranking = bits, U32, 1248, [4:4] +isIacTableForCoasting = bits, U32, 1248, [5:5] +notIdling = bits, U32, 1248, [6:6] +needReset = bits, U32, 1248, [7:7] +isInDeadZone = bits, U32, 1248, [8:8] +isBlipping = bits, U32, 1248, [9:9] +looksLikeRunning = bits, U32, 1248, [10:10] +looksLikeCoasting = bits, U32, 1248, [11:11] +looksLikeCrankToIdle = bits, U32, 1248, [12:12] +isIdleCoasting = bits, U32, 1248, [13:13] +isIdleClosedLoop = bits, U32, 1248, [14:14] +idleTarget = scalar, S32, 1252, "", 1, 0 +targetRpmByClt = scalar, S32, 1256, "", 1, 0 +targetRpmAcBump = scalar, S32, 1260, "", 1, 0 +iacByRpmTaper = scalar, F32, 1264 +luaAdd = scalar, F32, 1268 +luaAddRpm = scalar, F32, 1272 +; total TS size = 1276 +idlePosition = scalar, F32, 1276, "per", 1, 0 +trim = scalar, F32, 1280, "", 1, 0 +luaAdjustment = scalar, F32, 1284, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 +etbFeedForward = scalar, F32, 1292 +etbIntegralError = scalar, F32, 1296, "", 1, 0 +etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 +etbRevLimitActive = bits, U32, 1308, [0:0] +jamDetected = bits, U32, 1308, [1:1] +etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 +etbDutyAverage = scalar, F32, 1316, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 +etbErrorCode = scalar, S08, 1324, "", 1, 0 +jamTimer = scalar, U16, 1326, "sec", 0.01, 0 +; total TS size = 1328 +faultCode = scalar, U08, 1328, "", 1, 0 +heaterDuty = scalar, U08, 1329, "%", 1, 0 +pumpDuty = scalar, U08, 1330, "%", 1, 0 +tempC = scalar, U16, 1332, "C", 1, 0 +nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 +esr = scalar, U16, 1336, "ohm", 1, 0 +; total TS size = 1340 +dcOutput0 = scalar, F32, 1340, "per", 1, 0 +isEnabled0_int = scalar, U08, 1344, "per", 1, 0 +isEnabled0 = bits, U32, 1348, [0:0] +; total TS size = 1352 +value0 = scalar, U16, 1352, "value", 1, 0 +value1 = scalar, U16, 1354, "value", 1, 0 +errorRate = scalar, F32, 1356, "ratio", 1, 0 +; total TS size = 1360 +throttleUseWotModel = bits, U32, 1360, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 +; total TS size = 1372 +vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1374, "%", 0.5, 0 ; total TS size = 1376 -vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1378, "%", 0.5, 0 -; total TS size = 1380 -lambdaCurrentlyGood = bits, U32, 1380, [0:0] -lambdaMonitorCut = bits, U32, 1380, [1:1] -lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 -; total TS size = 1388 +lambdaCurrentlyGood = bits, U32, 1376, [0:0] +lambdaMonitorCut = bits, U32, 1376, [1:1] +lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 +; total TS size = 1384 time = { timeNow } @@ -4895,7 +4894,6 @@ entry = engineTooHot, "AC engine too hot", int, "%d" entry = tpsTooHigh, "AC tps too high", int, "%d" entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" @@ -5726,7 +5724,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 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 d4244470ab..f51b9261de 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 @@ -1179,9 +1179,9 @@ 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 (FOME) master.2024.08.13.f407-discovery.3350036656"; + public static final String TS_SIGNATURE = "rusEFI (FOME) master.2024.08.13.f407-discovery.3897121839"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1388; + public static final int TS_TOTAL_OUTPUT_SIZE = 1384; 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;