diff --git a/firmware/controllers/actuators/ac_control_generated.h b/firmware/controllers/actuators/ac_control_generated.h index 629f0b62d4..6b3195ea85 100644 --- a/firmware/controllers/actuators/ac_control_generated.h +++ b/firmware/controllers/actuators/ac_control_generated.h @@ -74,9 +74,6 @@ struct ac_control_s { bool unusedBit_0_30 : 1 {}; // offset 0 bit 31 bool unusedBit_0_31 : 1 {}; - // offset 4 - int acSwitchLastChangeTimeMs = (int)0; }; -static_assert(sizeof(ac_control_s) == 8); -static_assert(offsetof(ac_control_s, acSwitchLastChangeTimeMs) == 4); +static_assert(sizeof(ac_control_s) == 4); diff --git a/firmware/tunerstudio/generated/fome_alphax-2chan.ini b/firmware/tunerstudio/generated/fome_alphax-2chan.ini index 1256d671b9..905c941237 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.09.13.alphax-2chan.4167789088" + signature = "rusEFI (FOME) master.2024.09.13.alphax-2chan.1582139521" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.alphax-2chan.4167789088" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.alphax-2chan.1582139521" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5640,8 +5638,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_alphax-4chan.ini b/firmware/tunerstudio/generated/fome_alphax-4chan.ini index 9df8e775b0..5c513adc72 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.09.13.alphax-4chan.1923311681" + signature = "rusEFI (FOME) master.2024.09.13.alphax-4chan.3565521632" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.alphax-4chan.1923311681" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.alphax-4chan.3565521632" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_alphax-8chan.ini b/firmware/tunerstudio/generated/fome_alphax-8chan.ini index 638c5d3efa..edb80cb8f9 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.09.13.alphax-8chan.169373368" + signature = "rusEFI (FOME) master.2024.09.13.alphax-8chan.2889780249" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.alphax-8chan.169373368" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.alphax-8chan.2889780249" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_atlas.ini b/firmware/tunerstudio/generated/fome_atlas.ini index aeb89b6d45..b0b159aa0f 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.09.13.atlas.1953672651" + signature = "rusEFI (FOME) master.2024.09.13.atlas.3528740714" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.atlas.1953672651" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.atlas.3528740714" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5642,8 +5640,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_core48.ini b/firmware/tunerstudio/generated/fome_core48.ini index f2637ade23..22433acc82 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.09.13.core48.3261752722" + signature = "rusEFI (FOME) master.2024.09.13.core48.1682736947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.core48.3261752722" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.core48.1682736947" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5644,8 +5642,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_core8.ini b/firmware/tunerstudio/generated/fome_core8.ini index fab2d98459..7920662a65 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.09.13.core8.3843252305" + signature = "rusEFI (FOME) master.2024.09.13.core8.1127580400" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.core8.3843252305" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.core8.1127580400" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5644,8 +5642,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_f407-discovery.ini b/firmware/tunerstudio/generated/fome_f407-discovery.ini index 8a390d5d2e..db431d1e43 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.09.13.f407-discovery.1014688903" + signature = "rusEFI (FOME) master.2024.09.13.f407-discovery.2589724198" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.f407-discovery.1014688903" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.f407-discovery.2589724198" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5644,8 +5642,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_f429-discovery.ini b/firmware/tunerstudio/generated/fome_f429-discovery.ini index 77a64e624e..94289da9a0 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.09.13.f429-discovery.3711200743" + signature = "rusEFI (FOME) master.2024.09.13.f429-discovery.2064813894" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.f429-discovery.3711200743" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.f429-discovery.2064813894" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5642,8 +5640,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_frankenso_na6.ini b/firmware/tunerstudio/generated/fome_frankenso_na6.ini index 50c727a0bc..82d37d97ff 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.09.13.frankenso_na6.4284910893" + signature = "rusEFI (FOME) master.2024.09.13.frankenso_na6.1497395084" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.frankenso_na6.4284910893" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.frankenso_na6.1497395084" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5642,8 +5640,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_harley81.ini b/firmware/tunerstudio/generated/fome_harley81.ini index 58c26033dc..cf0bdd1dfa 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.09.13.harley81.1419859357" + signature = "rusEFI (FOME) master.2024.09.13.harley81.4068980540" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.harley81.1419859357" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.harley81.4068980540" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini index 1086f16365..4ef46ebdfb 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.09.13.hellen-gm-e67.3026010932" + signature = "rusEFI (FOME) master.2024.09.13.hellen-gm-e67.310092181" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen-gm-e67.3026010932" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen-gm-e67.310092181" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini index dafa7c50a3..1389182eda 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.09.13.hellen-honda-k.801934709" + signature = "rusEFI (FOME) master.2024.09.13.hellen-honda-k.2313842644" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen-honda-k.801934709" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen-honda-k.2313842644" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen-nb1.ini b/firmware/tunerstudio/generated/fome_hellen-nb1.ini index 23b6da1291..be91d662f7 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.09.13.hellen-nb1.705920091" + signature = "rusEFI (FOME) master.2024.09.13.hellen-nb1.2352324346" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen-nb1.705920091" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen-nb1.2352324346" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen121nissan.ini b/firmware/tunerstudio/generated/fome_hellen121nissan.ini index 86666d22e1..ca743835cb 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.09.13.hellen121nissan.1523109905" + signature = "rusEFI (FOME) master.2024.09.13.hellen121nissan.4243468976" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen121nissan.1523109905" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen121nissan.4243468976" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen121vag.ini b/firmware/tunerstudio/generated/fome_hellen121vag.ini index 88c27bf297..7de906d1f5 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.09.13.hellen121vag.4140556226" + signature = "rusEFI (FOME) master.2024.09.13.hellen121vag.1357725027" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen121vag.4140556226" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen121vag.1357725027" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen128.ini b/firmware/tunerstudio/generated/fome_hellen128.ini index 59c1dfcf59..1f0c6e3dc6 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.09.13.hellen128.1571163200" + signature = "rusEFI (FOME) master.2024.09.13.hellen128.4219530977" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen128.1571163200" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen128.4219530977" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini index 87f2c71f28..8377d34457 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.09.13.hellen154hyundai.3377540257" + signature = "rusEFI (FOME) master.2024.09.13.hellen154hyundai.1870122496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen154hyundai.3377540257" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen154hyundai.1870122496" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen72.ini b/firmware/tunerstudio/generated/fome_hellen72.ini index 6be50705c3..85821918e5 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.09.13.hellen72.746648656" + signature = "rusEFI (FOME) master.2024.09.13.hellen72.2326140657" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen72.746648656" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen72.2326140657" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen81.ini b/firmware/tunerstudio/generated/fome_hellen81.ini index 30482e2ea6..9a16a23c55 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.09.13.hellen81.2148175570" + signature = "rusEFI (FOME) master.2024.09.13.hellen81.640445555" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen81.2148175570" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen81.640445555" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5641,8 +5639,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen88bmw.ini b/firmware/tunerstudio/generated/fome_hellen88bmw.ini index 636d4218d3..71d5e34fbe 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.09.13.hellen88bmw.2251463137" + signature = "rusEFI (FOME) master.2024.09.13.hellen88bmw.538213184" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellen88bmw.2251463137" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellen88bmw.538213184" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellenNA6.ini b/firmware/tunerstudio/generated/fome_hellenNA6.ini index d1e40d4ef2..c646794c5d 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.09.13.hellenNA6.3520124864" + signature = "rusEFI (FOME) master.2024.09.13.hellenNA6.2012624225" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellenNA6.3520124864" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellenNA6.2012624225" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini index 45ddb71ad6..d4752e8b08 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.09.13.hellenNA8_96.1914723280" + signature = "rusEFI (FOME) master.2024.09.13.hellenNA8_96.3557210481" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.hellenNA8_96.1914723280" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.hellenNA8_96.3557210481" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5643,8 +5641,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_mre_f4.ini b/firmware/tunerstudio/generated/fome_mre_f4.ini index 6ff754b283..a635b38f67 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.09.13.mre_f4.985270367" + signature = "rusEFI (FOME) master.2024.09.13.mre_f4.2627529470" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.mre_f4.985270367" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.mre_f4.2627529470" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4817,7 +4816,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5645,8 +5643,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_mre_f7.ini b/firmware/tunerstudio/generated/fome_mre_f7.ini index 3d68b2dee3..9b8f42ae4c 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.09.13.mre_f7.985270367" + signature = "rusEFI (FOME) master.2024.09.13.mre_f7.2627529470" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.mre_f7.985270367" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.mre_f7.2627529470" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4817,7 +4816,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5645,8 +5643,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_prometheus_405.ini b/firmware/tunerstudio/generated/fome_prometheus_405.ini index 43b214e43e..fef1456653 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.09.13.prometheus_405.3986727031" + signature = "rusEFI (FOME) master.2024.09.13.prometheus_405.1267090134" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.prometheus_405.3986727031" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.prometheus_405.1267090134" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5637,8 +5635,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_prometheus_469.ini b/firmware/tunerstudio/generated/fome_prometheus_469.ini index abc3c473ff..40f1206e30 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.09.13.prometheus_469.3986727031" + signature = "rusEFI (FOME) master.2024.09.13.prometheus_469.1267090134" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.prometheus_469.3986727031" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.prometheus_469.1267090134" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5637,8 +5635,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_proteus_f4.ini b/firmware/tunerstudio/generated/fome_proteus_f4.ini index 9f6c5e3c05..ded4382880 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.09.13.proteus_f4.1474131098" + signature = "rusEFI (FOME) master.2024.09.13.proteus_f4.4059797051" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.proteus_f4.1474131098" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.proteus_f4.4059797051" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 24804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5639,8 +5637,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_proteus_f7.ini b/firmware/tunerstudio/generated/fome_proteus_f7.ini index 453a2776be..6c818201e9 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.09.13.proteus_f7.1474131098" + signature = "rusEFI (FOME) master.2024.09.13.proteus_f7.4059797051" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.proteus_f7.1474131098" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.proteus_f7.4059797051" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 24804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5639,8 +5637,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_proteus_h7.ini b/firmware/tunerstudio/generated/fome_proteus_h7.ini index 37b5947248..20bc4f1528 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.09.13.proteus_h7.1474131098" + signature = "rusEFI (FOME) master.2024.09.13.proteus_h7.4059797051" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.proteus_h7.1474131098" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.proteus_h7.4059797051" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 24804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5639,8 +5637,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_small-can-board.ini b/firmware/tunerstudio/generated/fome_small-can-board.ini index 8ffbf6f07b..fd22e8ef76 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.09.13.small-can-board.894990969" + signature = "rusEFI (FOME) master.2024.09.13.small-can-board.2474547416" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.small-can-board.894990969" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.small-can-board.2474547416" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 37804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5641,8 +5639,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" diff --git a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini index f9a220cfd7..e09a85fa66 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.09.13.tdg-pdm8.1469727173" + signature = "rusEFI (FOME) master.2024.09.13.tdg-pdm8.4055671652" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.09.13.tdg-pdm8.1469727173" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.09.13.tdg-pdm8.4055671652" ; 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 @@ -2282,7 +2282,7 @@ dfcoMapRpmValues = array, U08, 20804, [4], "MAP", 1, 0, 0, 50, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1288 + ochBlockSize = 1284 ; ; see TunerStudioOutputChannels struct @@ -2742,173 +2742,172 @@ engineTooHot = bits, U32, 892, [5:5] tpsTooHigh = bits, U32, 892, [6:6] isDisabledByLua = bits, U32, 892, [7:7] acCompressorState = bits, U32, 892, [8:8] -acSwitchLastChangeTimeMs = scalar, S32, 896, "", 1, 0 +; total TS size = 896 +cranking = bits, U32, 896, [0:0] +notRunning = bits, U32, 896, [1:1] +disabledWhileEngineStopped = bits, U32, 896, [2:2] +brokenClt = bits, U32, 896, [3:3] +enabledForAc = bits, U32, 896, [4:4] +hot = bits, U32, 896, [5:5] +cold = bits, U32, 896, [6:6] ; total TS size = 900 -cranking = bits, U32, 900, [0:0] -notRunning = bits, U32, 900, [1:1] -disabledWhileEngineStopped = bits, U32, 900, [2:2] -brokenClt = bits, U32, 900, [3:3] -enabledForAc = bits, U32, 900, [4:4] -hot = bits, U32, 900, [5:5] -cold = bits, U32, 900, [6:6] +isPrime = bits, U32, 900, [0:0] +engineTurnedRecently = bits, U32, 900, [1:1] +isFuelPumpOn = bits, U32, 900, [2:2] +ignitionOn = bits, U32, 900, [3:3] ; total TS size = 904 -isPrime = bits, U32, 904, [0:0] -engineTurnedRecently = bits, U32, 904, [1:1] -isFuelPumpOn = bits, U32, 904, [2:2] -ignitionOn = bits, U32, 904, [3:3] +isBenchTest = bits, U32, 904, [0:0] +hasIgnitionVoltage = bits, U32, 904, [1:1] +mainRelayState = bits, U32, 904, [2:2] +delayedShutoffRequested = bits, U32, 904, [3:3] ; total TS size = 908 -isBenchTest = bits, U32, 908, [0:0] -hasIgnitionVoltage = bits, U32, 908, [1:1] -mainRelayState = bits, U32, 908, [2:2] -delayedShutoffRequested = bits, U32, 908, [3:3] -; total TS size = 912 -lua_fuelAdd = scalar, F32, 912, "g", 1, 0 -lua_fuelMult = scalar, F32, 916, "", 1, 0 -lua_clutchUpState = bits, U32, 920, [0:0] -lua_brakePedalState = bits, U32, 920, [1:1] -lua_acRequestState = bits, U32, 920, [2:2] -lua_luaDisableEtb = bits, U32, 920, [3:3] -lua_luaIgnCut = bits, U32, 920, [4:4] -sd_tCharge = scalar, S16, 924, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 928, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 932, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 936, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_fuel = scalar, U16, 944, "mg", 0.01, 0 -baroCorrection = scalar, F32, 948, "", 1, 0 -hellenBoardId = scalar, S16, 952, "id", 1, 0 -clutchUpState = bits, U32, 956, [0:0] -clutchDownState = bits, U32, 956, [1:1] -brakePedalState = bits, U32, 956, [2:2] -startStopState = bits, U32, 956, [3:3] -startStopStateToggleCounter = scalar, U32, 960, "", 1, 0 -egtValue1 = scalar, F32, 964, "", 1, 0 -egtValue2 = scalar, F32, 968, "", 1, 0 -desiredRpmLimit = scalar, S16, 972, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 976, "", 1, 0 -sparkCounter = scalar, U32, 980, "", 1, 0 -fuelingLoad = scalar, F32, 984, "", 1, 0 -ignitionLoad = scalar, F32, 988, "", 1, 0 -veTableYAxis = scalar, U16, 992, "%", 0.01, 0 -mapAveragingDuration = scalar, U16, 994, "deg", 0.01, 0 -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, U32, 1044, "", 1, 0 -hwEventCounters2 = scalar, U32, 1048, "", 1, 0 -hwEventCounters3 = scalar, U32, 1052, "", 1, 0 -hwEventCounters4 = scalar, U32, 1056, "", 1, 0 -hwEventCounters5 = scalar, U32, 1060, "", 1, 0 -hwEventCounters6 = scalar, U32, 1064, "", 1, 0 -vvtCamCounter = scalar, U32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1084, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1088, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1092, "", 1, 0 -; total TS size = 1096 -crankSynchronizationCounter = scalar, U32, 1096, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 -triggerStateIndex = scalar, U08, 1108, "", 1, 0 -vvtCounter = scalar, U08, 1109, "", 1, 0 -vvtStateIndex = scalar, U08, 1110, "", 1, 0 -; total TS size = 1112 -camResyncCounter = scalar, U08, 1112, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1116, [0:0] -; total TS size = 1120 -wallFuelCorrection = scalar, F32, 1120, "", 1, 0 -wallFuel = scalar, F32, 1124, "", 1, 0 -; total TS size = 1128 -idleState = bits, S32, 1128, [0:2], "not important" -currentIdlePosition = scalar, F32, 1132 -baseIdlePosition = scalar, F32, 1136 -idleClosedLoop = scalar, F32, 1140 -iacByTpsTaper = scalar, F32, 1144 -throttlePedalUpState = scalar, S32, 1148, "", 1, 0 -mightResetPid = bits, U32, 1152, [0:0] -shouldResetPid = bits, U32, 1152, [1:1] -wasResetPid = bits, U32, 1152, [2:2] -mustResetPid = bits, U32, 1152, [3:3] -isCranking = bits, U32, 1152, [4:4] -isIacTableForCoasting = bits, U32, 1152, [5:5] -notIdling = bits, U32, 1152, [6:6] -needReset = bits, U32, 1152, [7:7] -isInDeadZone = bits, U32, 1152, [8:8] -isBlipping = bits, U32, 1152, [9:9] -looksLikeRunning = bits, U32, 1152, [10:10] -looksLikeCoasting = bits, U32, 1152, [11:11] -looksLikeCrankToIdle = bits, U32, 1152, [12:12] -isIdleCoasting = bits, U32, 1152, [13:13] -isIdleClosedLoop = bits, U32, 1152, [14:14] -idleTarget = scalar, S32, 1156, "", 1, 0 -targetRpmByClt = scalar, S32, 1160, "", 1, 0 -targetRpmAcBump = scalar, S32, 1164, "", 1, 0 -iacByRpmTaper = scalar, F32, 1168 -luaAdd = scalar, F32, 1172 -luaAddRpm = scalar, F32, 1176 -; total TS size = 1180 -idlePosition = scalar, F32, 1180, "per", 1, 0 -trim = scalar, F32, 1184, "", 1, 0 -luaAdjustment = scalar, F32, 1188, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1192, "per", 1, 0 -etbFeedForward = scalar, F32, 1196 -etbIntegralError = scalar, F32, 1200, "", 1, 0 -etbCurrentTarget = scalar, F32, 1204, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1208, "%", 1, 0 -etbRevLimitActive = bits, U32, 1212, [0:0] -jamDetected = bits, U32, 1212, [1:1] -etbDutyRateOfChange = scalar, F32, 1216, "per", 1, 0 -etbDutyAverage = scalar, F32, 1220, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1224, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1226, "count", 1, 0 -etbErrorCode = scalar, S08, 1228, "", 1, 0 -jamTimer = scalar, U16, 1230, "sec", 0.01, 0 -; total TS size = 1232 -faultCode = scalar, U08, 1232, "", 1, 0 -heaterDuty = scalar, U08, 1233, "%", 1, 0 -pumpDuty = scalar, U08, 1234, "%", 1, 0 -tempC = scalar, U16, 1236, "C", 1, 0 -nernstVoltage = scalar, U16, 1238, "V", 0.001, 0 -esr = scalar, U16, 1240, "ohm", 1, 0 -; total TS size = 1244 -dcOutput0 = scalar, F32, 1244, "per", 1, 0 -isEnabled0_int = scalar, U08, 1248, "per", 1, 0 -isEnabled0 = bits, U32, 1252, [0:0] -; total TS size = 1256 -value0 = scalar, U16, 1256, "value", 1, 0 -value1 = scalar, U16, 1258, "value", 1, 0 -errorRate = scalar, F32, 1260, "ratio", 1, 0 -; total TS size = 1264 -throttleUseWotModel = bits, U32, 1264, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1268, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1272, "g/s", 1, 0 +lua_fuelAdd = scalar, F32, 908, "g", 1, 0 +lua_fuelMult = scalar, F32, 912, "", 1, 0 +lua_clutchUpState = bits, U32, 916, [0:0] +lua_brakePedalState = bits, U32, 916, [1:1] +lua_acRequestState = bits, U32, 916, [2:2] +lua_luaDisableEtb = bits, U32, 916, [3:3] +lua_luaIgnCut = bits, U32, 916, [4:4] +sd_tCharge = scalar, S16, 920, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 924, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 928, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 932, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 936, "", 1, 0 +crankingFuel_fuel = scalar, U16, 940, "mg", 0.01, 0 +baroCorrection = scalar, F32, 944, "", 1, 0 +hellenBoardId = scalar, S16, 948, "id", 1, 0 +clutchUpState = bits, U32, 952, [0:0] +clutchDownState = bits, U32, 952, [1:1] +brakePedalState = bits, U32, 952, [2:2] +startStopState = bits, U32, 952, [3:3] +startStopStateToggleCounter = scalar, U32, 956, "", 1, 0 +egtValue1 = scalar, F32, 960, "", 1, 0 +egtValue2 = scalar, F32, 964, "", 1, 0 +desiredRpmLimit = scalar, S16, 968, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 972, "", 1, 0 +sparkCounter = scalar, U32, 976, "", 1, 0 +fuelingLoad = scalar, F32, 980, "", 1, 0 +ignitionLoad = scalar, F32, 984, "", 1, 0 +veTableYAxis = scalar, U16, 988, "%", 0.01, 0 +mapAveragingDuration = scalar, U16, 990, "deg", 0.01, 0 +; total TS size = 992 +tpsFrom = scalar, F32, 992 +tpsTo = scalar, F32, 996 +deltaTps = scalar, F32, 1000 +extraFuel = scalar, F32, 1004, "", 1, 0 +valueFromTable = scalar, F32, 1008, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1012, [0:0] +isBelowDecelThreshold = bits, U32, 1012, [1:1] +isTimeToResetAccumulator = bits, U32, 1012, [2:2] +isFractionalEnrichment = bits, U32, 1012, [3:3] +belowEpsilon = bits, U32, 1012, [4:4] +tooShort = bits, U32, 1012, [5:5] +fractionalInjFuel = scalar, F32, 1016, "", 1, 0 +accumulatedValue = scalar, F32, 1020, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1024, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1028, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1032, "", 1, 0 +cycleCnt = scalar, S32, 1036, "", 1, 0 +; total TS size = 1040 +hwEventCounters1 = scalar, U32, 1040, "", 1, 0 +hwEventCounters2 = scalar, U32, 1044, "", 1, 0 +hwEventCounters3 = scalar, U32, 1048, "", 1, 0 +hwEventCounters4 = scalar, U32, 1052, "", 1, 0 +hwEventCounters5 = scalar, U32, 1056, "", 1, 0 +hwEventCounters6 = scalar, U32, 1060, "", 1, 0 +vvtCamCounter = scalar, U32, 1064, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1068, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1072, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1076, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1077, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1080, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1084, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1088, "", 1, 0 +; total TS size = 1092 +crankSynchronizationCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1100, "", 1, 0 +triggerStateIndex = scalar, U08, 1104, "", 1, 0 +vvtCounter = scalar, U08, 1105, "", 1, 0 +vvtStateIndex = scalar, U08, 1106, "", 1, 0 +; total TS size = 1108 +camResyncCounter = scalar, U08, 1108, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1112, [0:0] +; total TS size = 1116 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +idleClosedLoop = scalar, F32, 1136 +iacByTpsTaper = scalar, F32, 1140 +throttlePedalUpState = scalar, S32, 1144, "", 1, 0 +mightResetPid = bits, U32, 1148, [0:0] +shouldResetPid = bits, U32, 1148, [1:1] +wasResetPid = bits, U32, 1148, [2:2] +mustResetPid = bits, U32, 1148, [3:3] +isCranking = bits, U32, 1148, [4:4] +isIacTableForCoasting = bits, U32, 1148, [5:5] +notIdling = bits, U32, 1148, [6:6] +needReset = bits, U32, 1148, [7:7] +isInDeadZone = bits, U32, 1148, [8:8] +isBlipping = bits, U32, 1148, [9:9] +looksLikeRunning = bits, U32, 1148, [10:10] +looksLikeCoasting = bits, U32, 1148, [11:11] +looksLikeCrankToIdle = bits, U32, 1148, [12:12] +isIdleCoasting = bits, U32, 1148, [13:13] +isIdleClosedLoop = bits, U32, 1148, [14:14] +idleTarget = scalar, S32, 1152, "", 1, 0 +targetRpmByClt = scalar, S32, 1156, "", 1, 0 +targetRpmAcBump = scalar, S32, 1160, "", 1, 0 +iacByRpmTaper = scalar, F32, 1164 +luaAdd = scalar, F32, 1168 +luaAddRpm = scalar, F32, 1172 +; total TS size = 1176 +idlePosition = scalar, F32, 1176, "per", 1, 0 +trim = scalar, F32, 1180, "", 1, 0 +luaAdjustment = scalar, F32, 1184, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1188, "per", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1204, "%", 1, 0 +etbRevLimitActive = bits, U32, 1208, [0:0] +jamDetected = bits, U32, 1208, [1:1] +etbDutyRateOfChange = scalar, F32, 1212, "per", 1, 0 +etbDutyAverage = scalar, F32, 1216, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1220, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1222, "count", 1, 0 +etbErrorCode = scalar, S08, 1224, "", 1, 0 +jamTimer = scalar, U16, 1226, "sec", 0.01, 0 +; total TS size = 1228 +faultCode = scalar, U08, 1228, "", 1, 0 +heaterDuty = scalar, U08, 1229, "%", 1, 0 +pumpDuty = scalar, U08, 1230, "%", 1, 0 +tempC = scalar, U16, 1232, "C", 1, 0 +nernstVoltage = scalar, U16, 1234, "V", 0.001, 0 +esr = scalar, U16, 1236, "ohm", 1, 0 +; total TS size = 1240 +dcOutput0 = scalar, F32, 1240, "per", 1, 0 +isEnabled0_int = scalar, U08, 1244, "per", 1, 0 +isEnabled0 = bits, U32, 1248, [0:0] +; total TS size = 1252 +value0 = scalar, U16, 1252, "value", 1, 0 +value1 = scalar, U16, 1254, "value", 1, 0 +errorRate = scalar, F32, 1256, "ratio", 1, 0 +; total TS size = 1260 +throttleUseWotModel = bits, U32, 1260, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1264, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1268, "g/s", 1, 0 +; total TS size = 1272 +vvtTarget = scalar, U16, 1272, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1274, "%", 0.5, 0 ; total TS size = 1276 -vvtTarget = scalar, U16, 1276, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1278, "%", 0.5, 0 -; total TS size = 1280 -lambdaCurrentlyGood = bits, U32, 1280, [0:0] -lambdaMonitorCut = bits, U32, 1280, [1:1] -lambdaTimeSinceGood = scalar, U16, 1284, "sec", 0.01, 0 -; total TS size = 1288 +lambdaCurrentlyGood = bits, U32, 1276, [0:0] +lambdaMonitorCut = bits, U32, 1276, [1:1] +lambdaTimeSinceGood = scalar, U16, 1280, "sec", 0.01, 0 +; total TS size = 1284 time = { timeNow } @@ -4816,7 +4815,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 = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking, "cranking", int, "%d" entry = notRunning, "notRunning", int, "%d" entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" @@ -5642,8 +5640,6 @@ indicatorPanel = ac_controlIndicatorPanel, 2 dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "cranking No", "cranking Yes" 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 21423c8906..dc676c4cff 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 @@ -1001,7 +1001,6 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; - public static final int SIGNATURE_HASH = 1014688903; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; public static final int spi_device_e_SPI_DEVICE_3 = 3; @@ -1208,9 +1207,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.09.13.f407-discovery.1014688903"; + public static final String TS_SIGNATURE = "rusEFI (FOME) master.2024.09.13.f407-discovery.2589724198"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1288; + public static final int TS_TOTAL_OUTPUT_SIZE = 1284; 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;