diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini
index d0c9c670e1..1f64b1f116 100644
--- a/firmware/console/binary/generated/data_logs.ini
+++ b/firmware/console/binary/generated/data_logs.ini
@@ -382,197 +382,3 @@ entry = isHpfpInactive, "isHpfpInactive", int,    "%d"
 entry = m_pressureTarget_kPa, "GDI: target pressure", float,  "%.3f"
 entry = nextLobe, "GDI: nextLobe", float,  "%.3f"
 entry = di_nextStart, "GDI: next start", float,  "%.3f"
-entry = m_deadtime, "injectorLag(VBatt)", float,  "%.3f"
-entry = pressureDelta, "fuel: injector pressureDelta", float,  "%.3f"
-entry = pressureRatio, "fuel: injector pressureRatio", float,  "%.3f"
-entry = retardThresholdRpm, "retardThresholdRpm", int,    "%d"
-entry = combinedConditions, "combinedConditions", int,    "%d"
-entry = launchActivatePinState, "launchActivatePinState", int,    "%d"
-entry = isLaunchCondition, "isLaunchCondition", int,    "%d"
-entry = isSwitchActivated, "isSwitchActivated", int,    "%d"
-entry = isClutchActivated, "isClutchActivated", int,    "%d"
-entry = isValidInputPin, "isValidInputPin", int,    "%d"
-entry = activateSwitchCondition, "activateSwitchCondition", int,    "%d"
-entry = rpmCondition, "rpmCondition", int,    "%d"
-entry = speedCondition, "speedCondition", int,    "%d"
-entry = tpsCondition, "tpsCondition", int,    "%d"
-entry = isAntilagCondition, "isAntilagCondition", int,    "%d"
-entry = ALSMinRPMCondition, "ALSMinRPMCondition", int,    "%d"
-entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int,    "%d"
-entry = ALSMinCLTCondition, "ALSMinCLTCondition", int,    "%d"
-entry = ALSMaxCLTCondition, "ALSMaxCLTCondition", int,    "%d"
-entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int,    "%d"
-entry = isALSSwitchActivated, "isALSSwitchActivated", int,    "%d"
-entry = ALSActivatePinState, "ALSActivatePinState", int,    "%d"
-entry = ALSSwitchCondition, "ALSSwitchCondition", int,    "%d"
-entry = ALSTimerCondition, "ALSTimerCondition", int,    "%d"
-entry = fuelALSCorrection, "fuelALSCorrection", float,  "%.3f"
-entry = timingALSCorrection, "timingALSCorrection", float,  "%.3f"
-entry = timingALSSkip, "timingALSSkip", float,  "%.3f"
-entry = isTpsInvalid, "isTpsInvalid", int,    "%d"
-entry = m_shouldResetPid, "m_shouldResetPid", int,    "%d"
-entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int,    "%d"
-entry = isNotClosedLoop, "isNotClosedLoop", int,    "%d"
-entry = isZeroRpm, "isZeroRpm", int,    "%d"
-entry = hasInitBoost, "hasInitBoost", int,    "%d"
-entry = rpmTooLow, "rpmTooLow", int,    "%d"
-entry = tpsTooLow, "tpsTooLow", int,    "%d"
-entry = mapTooLow, "mapTooLow", int,    "%d"
-entry = luaTargetAdd, "Boost: Lua target add", float,  "%.3f"
-entry = boostOutput, "Boost: Output", float,  "%.3f"
-entry = luaTargetMult, "Boost: Lua target mult", float,  "%.3f"
-entry = openLoopPart, "Boost: Open loop", float,  "%.3f"
-entry = luaOpenLoopAdd, "Boost: Lua open loop add", float,  "%.3f"
-entry = boostControllerClosedLoopPart, "Boost: Closed loop", float,  "%.3f"
-entry = boostControlTarget, "Boost: Target", float,  "%.3f"
-entry = acButtonState, "AC switch", int,    "%d"
-entry = m_acEnabled, "AC enabled", int,    "%d"
-entry = engineTooSlow, "AC engine too slow", int,    "%d"
-entry = engineTooFast, "AC engine too fast", int,    "%d"
-entry = noClt, "AC no CLT", int,    "%d"
-entry = engineTooHot, "AC engine too hot", int,    "%d"
-entry = tpsTooHigh, "AC tps too high", int,    "%d"
-entry = isDisabledByLua, "AC disabled by Lua", int,    "%d"
-entry = acCompressorState, "AC compressor on", int,    "%d"
-entry = latest_usage_ac_control, "AC latest activity", int,    "%d"
-entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int,    "%d"
-entry = cranking, "cranking", int,    "%d"
-entry = notRunning, "notRunning", int,    "%d"
-entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int,    "%d"
-entry = brokenClt, "brokenClt", int,    "%d"
-entry = enabledForAc, "enabledForAc", int,    "%d"
-entry = hot, "hot", int,    "%d"
-entry = cold, "cold", int,    "%d"
-entry = isPrime, "isPrime", int,    "%d"
-entry = engineTurnedRecently, "engineTurnedRecently", int,    "%d"
-entry = isFuelPumpOn, "isFuelPumpOn", int,    "%d"
-entry = ignitionOn, "ignitionOn", int,    "%d"
-entry = isBenchTest, "isBenchTest", int,    "%d"
-entry = hasIgnitionVoltage, "hasIgnitionVoltage", int,    "%d"
-entry = mainRelayState, "mainRelayState", int,    "%d"
-entry = delayedShutoffRequested, "delayedShutoffRequested", int,    "%d"
-entry = lua_fuelAdd, "Lua: Fuel add", float,  "%.3f"
-entry = lua_fuelMult, "Lua: Fuel mult", float,  "%.3f"
-entry = lua_clutchUpState, "lua_clutchUpState", int,    "%d"
-entry = lua_brakePedalState, "lua_brakePedalState", int,    "%d"
-entry = lua_acRequestState, "lua_acRequestState", int,    "%d"
-entry = lua_luaDisableEtb, "lua_luaDisableEtb", int,    "%d"
-entry = lua_luaIgnCut, "lua_luaIgnCut", int,    "%d"
-entry = sd_tCharge, "Air: Charge temperature estimate", float,  "%.3f"
-entry = sd_tChargeK, "Air: Charge temperature estimate K", float,  "%.3f"
-entry = crankingFuel_coolantTemperatureCoefficient, "Fuel: cranking CLT mult", float,  "%.3f"
-entry = crankingFuel_tpsCoefficient, "Fuel: cranking TPS mult", float,  "%.3f"
-entry = crankingFuel_durationCoefficient, "Fuel: cranking duration mult", float,  "%.3f"
-entry = crankingFuel_fuel, "Fuel: Cranking cycle mass", float,  "%.3f"
-entry = baroCorrection, "Fuel: Barometric pressure mult", float,  "%.3f"
-entry = hellenBoardId, "Detected Board ID", int,    "%d"
-entry = clutchUpState, "Clutch: up", int,    "%d"
-entry = clutchDownState, "Clutch: down", int,    "%d"
-entry = brakePedalState, "Brake switch", int,    "%d"
-entry = startStopState, "startStopState", int,    "%d"
-entry = startStopStateToggleCounter, "startStopStateToggleCounter", int,    "%d"
-entry = egtValue1, "egtValue1", float,  "%.3f"
-entry = egtValue2, "egtValue2", float,  "%.3f"
-entry = desiredRpmLimit, "User-defined RPM hard limit", int,    "%d"
-entry = fuelInjectionCounter, "Fuel: Injection counter", int,    "%d"
-entry = sparkCounter, "Ign: Spark counter", int,    "%d"
-entry = fuelingLoad, "Fuel: Load", float,  "%.3f"
-entry = ignitionLoad, "Ign: Load", float,  "%.3f"
-entry = veTableYAxis, "veTableYAxis", float,  "%.3f"
-entry = tpsFrom, "Fuel: TPS AE from", float,  "%.3f"
-entry = tpsTo, "Fuel: TPS AE to", float,  "%.3f"
-entry = deltaTps, "Fuel: TPS AE change", float,  "%.3f"
-entry = extraFuel, "extraFuel", float,  "%.3f"
-entry = valueFromTable, "valueFromTable", float,  "%.3f"
-entry = isAboveAccelThreshold, "Fuel: TPS AE Active", int,    "%d"
-entry = isBelowDecelThreshold, "isBelowDecelThreshold", int,    "%d"
-entry = isTimeToResetAccumulator, "Accel: reset time", int,    "%d"
-entry = isFractionalEnrichment, "isFractionalEnrichment", int,    "%d"
-entry = belowEpsilon, "Accel: below threshold", int,    "%d"
-entry = tooShort, "Accel: too short", int,    "%d"
-entry = fractionalInjFuel, "fractionalInjFuel", float,  "%.3f"
-entry = accumulatedValue, "accumulatedValue", float,  "%.3f"
-entry = maxExtraPerCycle, "maxExtraPerCycle", float,  "%.3f"
-entry = maxExtraPerPeriod, "maxExtraPerPeriod", float,  "%.3f"
-entry = maxInjectedPerPeriod, "maxInjectedPerPeriod", float,  "%.3f"
-entry = cycleCnt, "cycleCnt", int,    "%d"
-entry = hwEventCounters1, "Hardware events since boot 1", int,    "%d"
-entry = hwEventCounters2, "Hardware events since boot 2", int,    "%d"
-entry = hwEventCounters3, "Hardware events since boot 3", int,    "%d"
-entry = hwEventCounters4, "Hardware events since boot 4", int,    "%d"
-entry = hwEventCounters5, "Hardware events since boot 5", int,    "%d"
-entry = hwEventCounters6, "Hardware events since boot 6", int,    "%d"
-entry = vvtCamCounter, "Sync: total cams front counter", int,    "%d"
-entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float,  "%.3f"
-entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float,  "%.3f"
-entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int,    "%d"
-entry = mapVvt_map_peak, "mapVvt_map_peak", int,    "%d"
-entry = currentEngineDecodedPhase, "Sync: Engine Phase", float,  "%.3f"
-entry = triggerToothAngleError, "Sync: trigger angle error", float,  "%.3f"
-entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int,    "%d"
-entry = crankSynchronizationCounter, "sync: Crank sync counter", int,    "%d"
-entry = vvtSyncGapRatio, "vvtSyncGapRatio", float,  "%.3f"
-entry = vvtToothDurations0, "vvtToothDurations0", int,    "%d"
-entry = vvtCurrentPosition, "vvtCurrentPosition", float,  "%.3f"
-entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float,  "%.3f"
-entry = triggerStateIndex, "triggerStateIndex", int,    "%d"
-entry = vvtCounter, "vvtCounter", int,    "%d"
-entry = camResyncCounter, "camResyncCounter", int,    "%d"
-entry = vvtStateIndex, "vvtStateIndex", int,    "%d"
-entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int,    "%d"
-entry = wallFuelCorrection, "fuel wallwetting injection time", float,  "%.3f"
-entry = wallFuel, "Fuel on the wall", float,  "%.3f"
-entry = idleState, "idleState", int,    "%d"
-entry = currentIdlePosition, "idle: current position", float,  "%.3f"
-entry = baseIdlePosition, "idle: base value", float,  "%.3f"
-entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float,  "%.3f"
-entry = throttlePedalUpState, "idle: throttlePedalUpState", int,    "%d"
-entry = mightResetPid, "idle: mightResetPid", int,    "%d"
-entry = shouldResetPid, "idle: shouldResetPid", int,    "%d"
-entry = wasResetPid, "idle: wasResetPid", int,    "%d"
-entry = mustResetPid, "idle: mustResetPid", int,    "%d"
-entry = isCranking, "idle: cranking", int,    "%d"
-entry = isIacTableForCoasting, "isIacTableForCoasting", int,    "%d"
-entry = notIdling, "notIdling", int,    "%d"
-entry = needReset, "idle: reset", int,    "%d"
-entry = isInDeadZone, "idle: dead zone", int,    "%d"
-entry = isBlipping, "isBlipping", int,    "%d"
-entry = useClosedLoop, "useClosedLoop", int,    "%d"
-entry = badTps, "badTps", int,    "%d"
-entry = looksLikeRunning, "looksLikeRunning", int,    "%d"
-entry = looksLikeCoasting, "looksLikeCoasting", int,    "%d"
-entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int,    "%d"
-entry = isVerboseIAC, "isVerboseIAC", int,    "%d"
-entry = isIdleCoasting, "idle: coasting", int,    "%d"
-entry = targetRpmByClt, "idle: target by CLT", int,    "%d"
-entry = targetRpmAcBump, "idle: A/C bump", int,    "%d"
-entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float,  "%.3f"
-entry = luaAdd, "idle: Lua Adder", float,  "%.3f"
-entry = idlePosition, "ETB: idlePosition", float,  "%.3f"
-entry = trim, "ETB: trim", float,  "%.3f"
-entry = luaAdjustment, "ETB: luaAdjustment", float,  "%.3f"
-entry = m_wastegatePosition, "DC: wastegatePosition", float,  "%.3f"
-entry = etbFeedForward, "etbFeedForward", float,  "%.3f"
-entry = etbIntegralError, "etbIntegralError", float,  "%.3f"
-entry = etbCurrentTarget, "etbCurrentTarget", float,  "%.3f"
-entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float,  "%.3f"
-entry = etbRevLimitActive, "etbRevLimitActive", int,    "%d"
-entry = jamDetected, "jamDetected", int,    "%d"
-entry = etbDutyRateOfChange, "ETB duty rate of change", float,  "%.3f"
-entry = etbDutyAverage, "ETB average duty", float,  "%.3f"
-entry = etbTpsErrorCounter, "ETB TPS error counter", int,    "%d"
-entry = etbPpsErrorCounter, "ETB pedal error counter", int,    "%d"
-entry = etbErrorCode, "etbErrorCode", int,    "%d"
-entry = jamTimer, "ETB jam timer", float,  "%.3f"
-entry = faultCode, "WBO: Fault code", int,    "%d"
-entry = heaterDuty, "WBO: Heater duty", int,    "%d"
-entry = pumpDuty, "WBO: Pump duty", int,    "%d"
-entry = tempC, "WBO: Temperature", int,    "%d"
-entry = nernstVoltage, "WBO: Nernst Voltage", float,  "%.3f"
-entry = esr, "WBO: ESR", int,    "%d"
-entry = dcOutput0, "DC: output0", float,  "%.3f"
-entry = isEnabled0_int, "DC: en0", int,    "%d"
-entry = isEnabled0, "isEnabled0", int,    "%d"
-entry = value0, "ETB: SENT value0", int,    "%d"
-entry = value1, "ETB: SENT value1", int,    "%d"
-entry = errorRate, "ETB: SENT error rate", float,  "%.3f"
diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini
index 375b8c0067..6ba68370c1 100644
--- a/firmware/console/binary/generated/output_channels.ini
+++ b/firmware/console/binary/generated/output_channels.ini
@@ -548,216 +548,3 @@ m_pressureTarget_kPa = scalar, F32, 952, "", 1, 0
 nextLobe = scalar, F32, 956, "", 1, 0
 di_nextStart = scalar, F32, 960, "v", 1, 0
 ; total TS size = 964
-m_deadtime = scalar, F32, 964, "", 1, 0
-pressureDelta = scalar, F32, 968, "kPa", 1, 0
-pressureRatio = scalar, F32, 972, "", 1, 0
-; total TS size = 976
-retardThresholdRpm = scalar, S32, 976, "", 1, 0
-combinedConditions = bits, U32, 980, [0:0]
-launchActivatePinState = bits, U32, 980, [1:1]
-isLaunchCondition = bits, U32, 980, [2:2]
-isSwitchActivated = bits, U32, 980, [3:3]
-isClutchActivated = bits, U32, 980, [4:4]
-isValidInputPin = bits, U32, 980, [5:5]
-activateSwitchCondition = bits, U32, 980, [6:6]
-rpmCondition = bits, U32, 980, [7:7]
-speedCondition = bits, U32, 980, [8:8]
-tpsCondition = bits, U32, 980, [9:9]
-; total TS size = 984
-isAntilagCondition = bits, U32, 984, [0:0]
-ALSMinRPMCondition = bits, U32, 984, [1:1]
-ALSMaxRPMCondition = bits, U32, 984, [2:2]
-ALSMinCLTCondition = bits, U32, 984, [3:3]
-ALSMaxCLTCondition = bits, U32, 984, [4:4]
-ALSMaxThrottleIntentCondition = bits, U32, 984, [5:5]
-isALSSwitchActivated = bits, U32, 984, [6:6]
-ALSActivatePinState = bits, U32, 984, [7:7]
-ALSSwitchCondition = bits, U32, 984, [8:8]
-ALSTimerCondition = bits, U32, 984, [9:9]
-fuelALSCorrection = scalar, F32, 988, "", 1, 0
-timingALSCorrection = scalar, S16, 992, "deg", 0.01, 0
-timingALSSkip = scalar, S16, 994, "deg", 0.01, 0
-; total TS size = 996
-isTpsInvalid = bits, U32, 996, [0:0]
-m_shouldResetPid = bits, U32, 996, [1:1]
-isBelowClosedLoopThreshold = bits, U32, 996, [2:2]
-isNotClosedLoop = bits, U32, 996, [3:3]
-isZeroRpm = bits, U32, 996, [4:4]
-hasInitBoost = bits, U32, 996, [5:5]
-rpmTooLow = bits, U32, 996, [6:6]
-tpsTooLow = bits, U32, 996, [7:7]
-mapTooLow = bits, U32, 996, [8:8]
-luaTargetAdd = scalar, S16, 1000, "v", 0.5,0
-boostOutput = scalar, S16, 1002, "percent", 0.01,0
-luaTargetMult = scalar, F32, 1004, "v", 1,0
-openLoopPart = scalar, F32, 1008, "v", 1,0
-luaOpenLoopAdd = scalar, F32, 1012, "v", 1,0
-boostControllerClosedLoopPart = scalar, S08, 1016, "%", 0.5,0
-boostControlTarget = scalar, S16, 1018, "kPa", 0.03333333333333333,0
-; total TS size = 1020
-acButtonState = bits, U32, 1020, [0:0]
-m_acEnabled = bits, U32, 1020, [1:1]
-engineTooSlow = bits, U32, 1020, [2:2]
-engineTooFast = bits, U32, 1020, [3:3]
-noClt = bits, U32, 1020, [4:4]
-engineTooHot = bits, U32, 1020, [5:5]
-tpsTooHigh = bits, U32, 1020, [6:6]
-isDisabledByLua = bits, U32, 1020, [7:7]
-acCompressorState = bits, U32, 1020, [8:8]
-latest_usage_ac_control = scalar, S32, 1024, "", 1, 0
-acSwitchLastChangeTimeMs = scalar, S32, 1028, "", 1, 0
-; total TS size = 1032
-cranking = bits, U32, 1032, [0:0]
-notRunning = bits, U32, 1032, [1:1]
-disabledWhileEngineStopped = bits, U32, 1032, [2:2]
-brokenClt = bits, U32, 1032, [3:3]
-enabledForAc = bits, U32, 1032, [4:4]
-hot = bits, U32, 1032, [5:5]
-cold = bits, U32, 1032, [6:6]
-; total TS size = 1036
-isPrime = bits, U32, 1036, [0:0]
-engineTurnedRecently = bits, U32, 1036, [1:1]
-isFuelPumpOn = bits, U32, 1036, [2:2]
-ignitionOn = bits, U32, 1036, [3:3]
-; total TS size = 1040
-isBenchTest = bits, U32, 1040, [0:0]
-hasIgnitionVoltage = bits, U32, 1040, [1:1]
-mainRelayState = bits, U32, 1040, [2:2]
-delayedShutoffRequested = bits, U32, 1040, [3:3]
-; total TS size = 1044
-lua_fuelAdd = scalar, F32, 1044, "g", 1, 0
-lua_fuelMult = scalar, F32, 1048, "", 1, 0
-lua_clutchUpState = bits, U32, 1052, [0:0]
-lua_brakePedalState = bits, U32, 1052, [1:1]
-lua_acRequestState = bits, U32, 1052, [2:2]
-lua_luaDisableEtb = bits, U32, 1052, [3:3]
-lua_luaIgnCut = bits, U32, 1052, [4:4]
-sd_tCharge = scalar, S16, 1056, "deg C", 0.01, 0
-sd_tChargeK = scalar, F32, 1060, "", 1, 0
-crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1064, "", 1, 0
-crankingFuel_tpsCoefficient = scalar, F32, 1068, "", 1, 0
-crankingFuel_durationCoefficient = scalar, F32, 1072, "", 1, 0
-crankingFuel_fuel = scalar, U16, 1076, "mg", 0.01, 0
-baroCorrection = scalar, F32, 1080, "", 1, 0
-hellenBoardId = scalar, S16, 1084, "id", 1, 0
-clutchUpState = bits, U32, 1088, [0:0]
-clutchDownState = bits, U32, 1088, [1:1]
-brakePedalState = bits, U32, 1088, [2:2]
-startStopState = bits, U32, 1088, [3:3]
-startStopStateToggleCounter = scalar, U32, 1092, "", 1, 0
-egtValue1 = scalar, F32, 1096, "", 1, 0
-egtValue2 = scalar, F32, 1100, "", 1, 0
-desiredRpmLimit = scalar, S16, 1104, "rpm", 1, 0
-fuelInjectionCounter = scalar, U32, 1108, "", 1, 0
-sparkCounter = scalar, U32, 1112, "", 1, 0
-fuelingLoad = scalar, F32, 1116, "", 1, 0
-ignitionLoad = scalar, F32, 1120, "", 1, 0
-veTableYAxis = scalar, U16, 1124, "%", 0.01, 0
-; total TS size = 1128
-tpsFrom = scalar, F32, 1128
-tpsTo = scalar, F32, 1132
-deltaTps = scalar, F32, 1136
-extraFuel = scalar, F32, 1140, "", 1, 0
-valueFromTable = scalar, F32, 1144, "", 1, 0
-isAboveAccelThreshold = bits, U32, 1148, [0:0]
-isBelowDecelThreshold = bits, U32, 1148, [1:1]
-isTimeToResetAccumulator = bits, U32, 1148, [2:2]
-isFractionalEnrichment = bits, U32, 1148, [3:3]
-belowEpsilon = bits, U32, 1148, [4:4]
-tooShort = bits, U32, 1148, [5:5]
-fractionalInjFuel = scalar, F32, 1152, "", 1, 0
-accumulatedValue = scalar, F32, 1156, "", 1, 0
-maxExtraPerCycle = scalar, F32, 1160, "", 1, 0
-maxExtraPerPeriod = scalar, F32, 1164, "", 1, 0
-maxInjectedPerPeriod = scalar, F32, 1168, "", 1, 0
-cycleCnt = scalar, S32, 1172, "", 1, 0
-; total TS size = 1176
-hwEventCounters1 = scalar, U32, 1176, "", 1, 0
-hwEventCounters2 = scalar, U32, 1180, "", 1, 0
-hwEventCounters3 = scalar, U32, 1184, "", 1, 0
-hwEventCounters4 = scalar, U32, 1188, "", 1, 0
-hwEventCounters5 = scalar, U32, 1192, "", 1, 0
-hwEventCounters6 = scalar, U32, 1196, "", 1, 0
-vvtCamCounter = scalar, U32, 1200, "", 1, 0
-mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1204, "", 1, 0
-mapVvt_MAP_AT_DIFF = scalar, F32, 1208, "", 1, 0
-mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1212, "", 1, 0
-mapVvt_map_peak = scalar, U08, 1213, "", 1, 0
-currentEngineDecodedPhase = scalar, F32, 1216, "deg", 1, 0
-triggerToothAngleError = scalar, F32, 1220, "deg", 1, 0
-triggerIgnoredToothCount = scalar, U08, 1224, "", 1, 0
-; total TS size = 1228
-crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0
-vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0
-vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0
-vvtCurrentPosition = scalar, F32, 1240, "", 1, 0
-triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0
-triggerStateIndex = scalar, U08, 1248, "", 1, 0
-vvtCounter = scalar, U08, 1249, "", 1, 0
-camResyncCounter = scalar, U08, 1250, "", 1, 0
-vvtStateIndex = scalar, U08, 1251, "", 1, 0
-; total TS size = 1252
-m_hasSynchronizedPhase = bits, U32, 1252, [0:0]
-; total TS size = 1256
-wallFuelCorrection = scalar, F32, 1256, "", 1, 0
-wallFuel = scalar, F32, 1260, "", 1, 0
-; total TS size = 1264
-idleState = bits, S32, 1264, [0:2], "not important"
-currentIdlePosition = scalar, F32, 1268
-baseIdlePosition = scalar, F32, 1272
-iacByTpsTaper = scalar, F32, 1276
-throttlePedalUpState = scalar, S32, 1280, "", 1, 0
-mightResetPid = bits, U32, 1284, [0:0]
-shouldResetPid = bits, U32, 1284, [1:1]
-wasResetPid = bits, U32, 1284, [2:2]
-mustResetPid = bits, U32, 1284, [3:3]
-isCranking = bits, U32, 1284, [4:4]
-isIacTableForCoasting = bits, U32, 1284, [5:5]
-notIdling = bits, U32, 1284, [6:6]
-needReset = bits, U32, 1284, [7:7]
-isInDeadZone = bits, U32, 1284, [8:8]
-isBlipping = bits, U32, 1284, [9:9]
-useClosedLoop = bits, U32, 1284, [10:10]
-badTps = bits, U32, 1284, [11:11]
-looksLikeRunning = bits, U32, 1284, [12:12]
-looksLikeCoasting = bits, U32, 1284, [13:13]
-looksLikeCrankToIdle = bits, U32, 1284, [14:14]
-isVerboseIAC = bits, U32, 1284, [15:15]
-isIdleCoasting = bits, U32, 1284, [16:16]
-targetRpmByClt = scalar, S32, 1288, "", 1, 0
-targetRpmAcBump = scalar, S32, 1292, "", 1, 0
-iacByRpmTaper = scalar, F32, 1296
-luaAdd = scalar, F32, 1300
-; total TS size = 1304
-idlePosition = scalar, F32, 1304, "per", 1,0
-trim = scalar, F32, 1308, "", 1, 0
-luaAdjustment = scalar, F32, 1312, "per", 1,0
-m_wastegatePosition = scalar, F32, 1316, "per", 1,0
-etbFeedForward = scalar, F32, 1320
-etbIntegralError = scalar, F32, 1324, "", 1, 0
-etbCurrentTarget = scalar, F32, 1328, "%", 1, 0
-etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0
-etbRevLimitActive = bits, U32, 1336, [0:0]
-jamDetected = bits, U32, 1336, [1:1]
-etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0
-etbDutyAverage = scalar, F32, 1344, "per", 1,0
-etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0
-etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0
-etbErrorCode = scalar, S08, 1352, "", 1, 0
-jamTimer = scalar, U16, 1354, "sec", 0.01, 0
-; total TS size = 1356
-faultCode = scalar, U08, 1356, "", 1, 0
-heaterDuty = scalar, U08, 1357, "%", 1, 0
-pumpDuty = scalar, U08, 1358, "%", 1, 0
-tempC = scalar, U16, 1360, "C", 1, 0
-nernstVoltage = scalar, U16, 1362, "V", 0.001, 0
-esr = scalar, U16, 1364, "ohm", 1, 0
-; total TS size = 1368
-dcOutput0 = scalar, F32, 1368, "per", 1,0
-isEnabled0_int = scalar, U08, 1372, "per", 1,0
-isEnabled0 = bits, U32, 1376, [0:0]
-; total TS size = 1380
-value0 = scalar, U16, 1380, "value", 1,0
-value1 = scalar, U16, 1382, "value", 1,0
-errorRate = scalar, F32, 1384, "ratio", 1,0
-; total TS size = 1388
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index da508d530c..342ecc9fdd 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -1080,7 +1080,7 @@
 #define SentEtbType_NONE 0
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH 1921070763
+#define SIGNATURE_HASH 2455027655
 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin"
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
@@ -1359,7 +1359,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI master.2023.07.03.f407-discovery.1921070763"
+#define TS_SIGNATURE "rusEFI master.2023.07.03.f407-discovery.2455027655"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'
diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h
index ddab3ecefb..329218b411 100644
--- a/firmware/controllers/generated/signature_f407-discovery.h
+++ b/firmware/controllers/generated/signature_f407-discovery.h
@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH 1921070763
-#define TS_SIGNATURE "rusEFI master.2023.07.03.f407-discovery.1921070763"
+#define SIGNATURE_HASH 2455027655
+#define TS_SIGNATURE "rusEFI master.2023.07.03.f407-discovery.2455027655"
diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini
index 08619c8a7d..dded414f7b 100644
--- a/firmware/tunerstudio/generated/rusefi.ini
+++ b/firmware/tunerstudio/generated/rusefi.ini
@@ -34,12 +34,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI master.2023.07.03.f407-discovery.1921070763"
+	signature	= "rusEFI master.2023.07.03.f407-discovery.2455027655"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI master.2023.07.03.f407-discovery.1921070763" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI master.2023.07.03.f407-discovery.2455027655" ; 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
@@ -90,7 +90,7 @@ enable2ndByteCanID = false
 #define output_pin_e_enum_list="NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
 
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Jul 02 23:36:24 UTC 2023
+; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Mon Jul 03 16:23:44 UTC 2023
 
 pageSize            = 23468
 page = 1
@@ -2831,219 +2831,6 @@ m_pressureTarget_kPa = scalar, F32, 952, "", 1, 0
 nextLobe = scalar, F32, 956, "", 1, 0
 di_nextStart = scalar, F32, 960, "v", 1, 0
 ; total TS size = 964
-m_deadtime = scalar, F32, 964, "", 1, 0
-pressureDelta = scalar, F32, 968, "kPa", 1, 0
-pressureRatio = scalar, F32, 972, "", 1, 0
-; total TS size = 976
-retardThresholdRpm = scalar, S32, 976, "", 1, 0
-combinedConditions = bits, U32, 980, [0:0]
-launchActivatePinState = bits, U32, 980, [1:1]
-isLaunchCondition = bits, U32, 980, [2:2]
-isSwitchActivated = bits, U32, 980, [3:3]
-isClutchActivated = bits, U32, 980, [4:4]
-isValidInputPin = bits, U32, 980, [5:5]
-activateSwitchCondition = bits, U32, 980, [6:6]
-rpmCondition = bits, U32, 980, [7:7]
-speedCondition = bits, U32, 980, [8:8]
-tpsCondition = bits, U32, 980, [9:9]
-; total TS size = 984
-isAntilagCondition = bits, U32, 984, [0:0]
-ALSMinRPMCondition = bits, U32, 984, [1:1]
-ALSMaxRPMCondition = bits, U32, 984, [2:2]
-ALSMinCLTCondition = bits, U32, 984, [3:3]
-ALSMaxCLTCondition = bits, U32, 984, [4:4]
-ALSMaxThrottleIntentCondition = bits, U32, 984, [5:5]
-isALSSwitchActivated = bits, U32, 984, [6:6]
-ALSActivatePinState = bits, U32, 984, [7:7]
-ALSSwitchCondition = bits, U32, 984, [8:8]
-ALSTimerCondition = bits, U32, 984, [9:9]
-fuelALSCorrection = scalar, F32, 988, "", 1, 0
-timingALSCorrection = scalar, S16, 992, "deg", 0.01, 0
-timingALSSkip = scalar, S16, 994, "deg", 0.01, 0
-; total TS size = 996
-isTpsInvalid = bits, U32, 996, [0:0]
-m_shouldResetPid = bits, U32, 996, [1:1]
-isBelowClosedLoopThreshold = bits, U32, 996, [2:2]
-isNotClosedLoop = bits, U32, 996, [3:3]
-isZeroRpm = bits, U32, 996, [4:4]
-hasInitBoost = bits, U32, 996, [5:5]
-rpmTooLow = bits, U32, 996, [6:6]
-tpsTooLow = bits, U32, 996, [7:7]
-mapTooLow = bits, U32, 996, [8:8]
-luaTargetAdd = scalar, S16, 1000, "v", 0.5,0
-boostOutput = scalar, S16, 1002, "percent", 0.01,0
-luaTargetMult = scalar, F32, 1004, "v", 1,0
-openLoopPart = scalar, F32, 1008, "v", 1,0
-luaOpenLoopAdd = scalar, F32, 1012, "v", 1,0
-boostControllerClosedLoopPart = scalar, S08, 1016, "%", 0.5,0
-boostControlTarget = scalar, S16, 1018, "kPa", 0.03333333333333333,0
-; total TS size = 1020
-acButtonState = bits, U32, 1020, [0:0]
-m_acEnabled = bits, U32, 1020, [1:1]
-engineTooSlow = bits, U32, 1020, [2:2]
-engineTooFast = bits, U32, 1020, [3:3]
-noClt = bits, U32, 1020, [4:4]
-engineTooHot = bits, U32, 1020, [5:5]
-tpsTooHigh = bits, U32, 1020, [6:6]
-isDisabledByLua = bits, U32, 1020, [7:7]
-acCompressorState = bits, U32, 1020, [8:8]
-latest_usage_ac_control = scalar, S32, 1024, "", 1, 0
-acSwitchLastChangeTimeMs = scalar, S32, 1028, "", 1, 0
-; total TS size = 1032
-cranking = bits, U32, 1032, [0:0]
-notRunning = bits, U32, 1032, [1:1]
-disabledWhileEngineStopped = bits, U32, 1032, [2:2]
-brokenClt = bits, U32, 1032, [3:3]
-enabledForAc = bits, U32, 1032, [4:4]
-hot = bits, U32, 1032, [5:5]
-cold = bits, U32, 1032, [6:6]
-; total TS size = 1036
-isPrime = bits, U32, 1036, [0:0]
-engineTurnedRecently = bits, U32, 1036, [1:1]
-isFuelPumpOn = bits, U32, 1036, [2:2]
-ignitionOn = bits, U32, 1036, [3:3]
-; total TS size = 1040
-isBenchTest = bits, U32, 1040, [0:0]
-hasIgnitionVoltage = bits, U32, 1040, [1:1]
-mainRelayState = bits, U32, 1040, [2:2]
-delayedShutoffRequested = bits, U32, 1040, [3:3]
-; total TS size = 1044
-lua_fuelAdd = scalar, F32, 1044, "g", 1, 0
-lua_fuelMult = scalar, F32, 1048, "", 1, 0
-lua_clutchUpState = bits, U32, 1052, [0:0]
-lua_brakePedalState = bits, U32, 1052, [1:1]
-lua_acRequestState = bits, U32, 1052, [2:2]
-lua_luaDisableEtb = bits, U32, 1052, [3:3]
-lua_luaIgnCut = bits, U32, 1052, [4:4]
-sd_tCharge = scalar, S16, 1056, "deg C", 0.01, 0
-sd_tChargeK = scalar, F32, 1060, "", 1, 0
-crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1064, "", 1, 0
-crankingFuel_tpsCoefficient = scalar, F32, 1068, "", 1, 0
-crankingFuel_durationCoefficient = scalar, F32, 1072, "", 1, 0
-crankingFuel_fuel = scalar, U16, 1076, "mg", 0.01, 0
-baroCorrection = scalar, F32, 1080, "", 1, 0
-hellenBoardId = scalar, S16, 1084, "id", 1, 0
-clutchUpState = bits, U32, 1088, [0:0]
-clutchDownState = bits, U32, 1088, [1:1]
-brakePedalState = bits, U32, 1088, [2:2]
-startStopState = bits, U32, 1088, [3:3]
-startStopStateToggleCounter = scalar, U32, 1092, "", 1, 0
-egtValue1 = scalar, F32, 1096, "", 1, 0
-egtValue2 = scalar, F32, 1100, "", 1, 0
-desiredRpmLimit = scalar, S16, 1104, "rpm", 1, 0
-fuelInjectionCounter = scalar, U32, 1108, "", 1, 0
-sparkCounter = scalar, U32, 1112, "", 1, 0
-fuelingLoad = scalar, F32, 1116, "", 1, 0
-ignitionLoad = scalar, F32, 1120, "", 1, 0
-veTableYAxis = scalar, U16, 1124, "%", 0.01, 0
-; total TS size = 1128
-tpsFrom = scalar, F32, 1128
-tpsTo = scalar, F32, 1132
-deltaTps = scalar, F32, 1136
-extraFuel = scalar, F32, 1140, "", 1, 0
-valueFromTable = scalar, F32, 1144, "", 1, 0
-isAboveAccelThreshold = bits, U32, 1148, [0:0]
-isBelowDecelThreshold = bits, U32, 1148, [1:1]
-isTimeToResetAccumulator = bits, U32, 1148, [2:2]
-isFractionalEnrichment = bits, U32, 1148, [3:3]
-belowEpsilon = bits, U32, 1148, [4:4]
-tooShort = bits, U32, 1148, [5:5]
-fractionalInjFuel = scalar, F32, 1152, "", 1, 0
-accumulatedValue = scalar, F32, 1156, "", 1, 0
-maxExtraPerCycle = scalar, F32, 1160, "", 1, 0
-maxExtraPerPeriod = scalar, F32, 1164, "", 1, 0
-maxInjectedPerPeriod = scalar, F32, 1168, "", 1, 0
-cycleCnt = scalar, S32, 1172, "", 1, 0
-; total TS size = 1176
-hwEventCounters1 = scalar, U32, 1176, "", 1, 0
-hwEventCounters2 = scalar, U32, 1180, "", 1, 0
-hwEventCounters3 = scalar, U32, 1184, "", 1, 0
-hwEventCounters4 = scalar, U32, 1188, "", 1, 0
-hwEventCounters5 = scalar, U32, 1192, "", 1, 0
-hwEventCounters6 = scalar, U32, 1196, "", 1, 0
-vvtCamCounter = scalar, U32, 1200, "", 1, 0
-mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1204, "", 1, 0
-mapVvt_MAP_AT_DIFF = scalar, F32, 1208, "", 1, 0
-mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1212, "", 1, 0
-mapVvt_map_peak = scalar, U08, 1213, "", 1, 0
-currentEngineDecodedPhase = scalar, F32, 1216, "deg", 1, 0
-triggerToothAngleError = scalar, F32, 1220, "deg", 1, 0
-triggerIgnoredToothCount = scalar, U08, 1224, "", 1, 0
-; total TS size = 1228
-crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0
-vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0
-vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0
-vvtCurrentPosition = scalar, F32, 1240, "", 1, 0
-triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0
-triggerStateIndex = scalar, U08, 1248, "", 1, 0
-vvtCounter = scalar, U08, 1249, "", 1, 0
-camResyncCounter = scalar, U08, 1250, "", 1, 0
-vvtStateIndex = scalar, U08, 1251, "", 1, 0
-; total TS size = 1252
-m_hasSynchronizedPhase = bits, U32, 1252, [0:0]
-; total TS size = 1256
-wallFuelCorrection = scalar, F32, 1256, "", 1, 0
-wallFuel = scalar, F32, 1260, "", 1, 0
-; total TS size = 1264
-idleState = bits, S32, 1264, [0:2], "not important"
-currentIdlePosition = scalar, F32, 1268
-baseIdlePosition = scalar, F32, 1272
-iacByTpsTaper = scalar, F32, 1276
-throttlePedalUpState = scalar, S32, 1280, "", 1, 0
-mightResetPid = bits, U32, 1284, [0:0]
-shouldResetPid = bits, U32, 1284, [1:1]
-wasResetPid = bits, U32, 1284, [2:2]
-mustResetPid = bits, U32, 1284, [3:3]
-isCranking = bits, U32, 1284, [4:4]
-isIacTableForCoasting = bits, U32, 1284, [5:5]
-notIdling = bits, U32, 1284, [6:6]
-needReset = bits, U32, 1284, [7:7]
-isInDeadZone = bits, U32, 1284, [8:8]
-isBlipping = bits, U32, 1284, [9:9]
-useClosedLoop = bits, U32, 1284, [10:10]
-badTps = bits, U32, 1284, [11:11]
-looksLikeRunning = bits, U32, 1284, [12:12]
-looksLikeCoasting = bits, U32, 1284, [13:13]
-looksLikeCrankToIdle = bits, U32, 1284, [14:14]
-isVerboseIAC = bits, U32, 1284, [15:15]
-isIdleCoasting = bits, U32, 1284, [16:16]
-targetRpmByClt = scalar, S32, 1288, "", 1, 0
-targetRpmAcBump = scalar, S32, 1292, "", 1, 0
-iacByRpmTaper = scalar, F32, 1296
-luaAdd = scalar, F32, 1300
-; total TS size = 1304
-idlePosition = scalar, F32, 1304, "per", 1,0
-trim = scalar, F32, 1308, "", 1, 0
-luaAdjustment = scalar, F32, 1312, "per", 1,0
-m_wastegatePosition = scalar, F32, 1316, "per", 1,0
-etbFeedForward = scalar, F32, 1320
-etbIntegralError = scalar, F32, 1324, "", 1, 0
-etbCurrentTarget = scalar, F32, 1328, "%", 1, 0
-etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0
-etbRevLimitActive = bits, U32, 1336, [0:0]
-jamDetected = bits, U32, 1336, [1:1]
-etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0
-etbDutyAverage = scalar, F32, 1344, "per", 1,0
-etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0
-etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0
-etbErrorCode = scalar, S08, 1352, "", 1, 0
-jamTimer = scalar, U16, 1354, "sec", 0.01, 0
-; total TS size = 1356
-faultCode = scalar, U08, 1356, "", 1, 0
-heaterDuty = scalar, U08, 1357, "%", 1, 0
-pumpDuty = scalar, U08, 1358, "%", 1, 0
-tempC = scalar, U16, 1360, "C", 1, 0
-nernstVoltage = scalar, U16, 1362, "V", 0.001, 0
-esr = scalar, U16, 1364, "ohm", 1, 0
-; total TS size = 1368
-dcOutput0 = scalar, F32, 1368, "per", 1,0
-isEnabled0_int = scalar, U08, 1372, "per", 1,0
-isEnabled0 = bits, U32, 1376, [0:0]
-; total TS size = 1380
-value0 = scalar, U16, 1380, "value", 1,0
-value1 = scalar, U16, 1382, "value", 1,0
-errorRate = scalar, F32, 1384, "ratio", 1,0
-; total TS size = 1388
 
 
 	time				= { timeNow }
@@ -4963,200 +4750,6 @@ entry = isHpfpInactive, "isHpfpInactive", int,    "%d"
 entry = m_pressureTarget_kPa, "GDI: target pressure", float,  "%.3f"
 entry = nextLobe, "GDI: nextLobe", float,  "%.3f"
 entry = di_nextStart, "GDI: next start", float,  "%.3f"
-entry = m_deadtime, "injectorLag(VBatt)", float,  "%.3f"
-entry = pressureDelta, "fuel: injector pressureDelta", float,  "%.3f"
-entry = pressureRatio, "fuel: injector pressureRatio", float,  "%.3f"
-entry = retardThresholdRpm, "retardThresholdRpm", int,    "%d"
-entry = combinedConditions, "combinedConditions", int,    "%d"
-entry = launchActivatePinState, "launchActivatePinState", int,    "%d"
-entry = isLaunchCondition, "isLaunchCondition", int,    "%d"
-entry = isSwitchActivated, "isSwitchActivated", int,    "%d"
-entry = isClutchActivated, "isClutchActivated", int,    "%d"
-entry = isValidInputPin, "isValidInputPin", int,    "%d"
-entry = activateSwitchCondition, "activateSwitchCondition", int,    "%d"
-entry = rpmCondition, "rpmCondition", int,    "%d"
-entry = speedCondition, "speedCondition", int,    "%d"
-entry = tpsCondition, "tpsCondition", int,    "%d"
-entry = isAntilagCondition, "isAntilagCondition", int,    "%d"
-entry = ALSMinRPMCondition, "ALSMinRPMCondition", int,    "%d"
-entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int,    "%d"
-entry = ALSMinCLTCondition, "ALSMinCLTCondition", int,    "%d"
-entry = ALSMaxCLTCondition, "ALSMaxCLTCondition", int,    "%d"
-entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int,    "%d"
-entry = isALSSwitchActivated, "isALSSwitchActivated", int,    "%d"
-entry = ALSActivatePinState, "ALSActivatePinState", int,    "%d"
-entry = ALSSwitchCondition, "ALSSwitchCondition", int,    "%d"
-entry = ALSTimerCondition, "ALSTimerCondition", int,    "%d"
-entry = fuelALSCorrection, "fuelALSCorrection", float,  "%.3f"
-entry = timingALSCorrection, "timingALSCorrection", float,  "%.3f"
-entry = timingALSSkip, "timingALSSkip", float,  "%.3f"
-entry = isTpsInvalid, "isTpsInvalid", int,    "%d"
-entry = m_shouldResetPid, "m_shouldResetPid", int,    "%d"
-entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int,    "%d"
-entry = isNotClosedLoop, "isNotClosedLoop", int,    "%d"
-entry = isZeroRpm, "isZeroRpm", int,    "%d"
-entry = hasInitBoost, "hasInitBoost", int,    "%d"
-entry = rpmTooLow, "rpmTooLow", int,    "%d"
-entry = tpsTooLow, "tpsTooLow", int,    "%d"
-entry = mapTooLow, "mapTooLow", int,    "%d"
-entry = luaTargetAdd, "Boost: Lua target add", float,  "%.3f"
-entry = boostOutput, "Boost: Output", float,  "%.3f"
-entry = luaTargetMult, "Boost: Lua target mult", float,  "%.3f"
-entry = openLoopPart, "Boost: Open loop", float,  "%.3f"
-entry = luaOpenLoopAdd, "Boost: Lua open loop add", float,  "%.3f"
-entry = boostControllerClosedLoopPart, "Boost: Closed loop", float,  "%.3f"
-entry = boostControlTarget, "Boost: Target", float,  "%.3f"
-entry = acButtonState, "AC switch", int,    "%d"
-entry = m_acEnabled, "AC enabled", int,    "%d"
-entry = engineTooSlow, "AC engine too slow", int,    "%d"
-entry = engineTooFast, "AC engine too fast", int,    "%d"
-entry = noClt, "AC no CLT", int,    "%d"
-entry = engineTooHot, "AC engine too hot", int,    "%d"
-entry = tpsTooHigh, "AC tps too high", int,    "%d"
-entry = isDisabledByLua, "AC disabled by Lua", int,    "%d"
-entry = acCompressorState, "AC compressor on", int,    "%d"
-entry = latest_usage_ac_control, "AC latest activity", int,    "%d"
-entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int,    "%d"
-entry = cranking, "cranking", int,    "%d"
-entry = notRunning, "notRunning", int,    "%d"
-entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int,    "%d"
-entry = brokenClt, "brokenClt", int,    "%d"
-entry = enabledForAc, "enabledForAc", int,    "%d"
-entry = hot, "hot", int,    "%d"
-entry = cold, "cold", int,    "%d"
-entry = isPrime, "isPrime", int,    "%d"
-entry = engineTurnedRecently, "engineTurnedRecently", int,    "%d"
-entry = isFuelPumpOn, "isFuelPumpOn", int,    "%d"
-entry = ignitionOn, "ignitionOn", int,    "%d"
-entry = isBenchTest, "isBenchTest", int,    "%d"
-entry = hasIgnitionVoltage, "hasIgnitionVoltage", int,    "%d"
-entry = mainRelayState, "mainRelayState", int,    "%d"
-entry = delayedShutoffRequested, "delayedShutoffRequested", int,    "%d"
-entry = lua_fuelAdd, "Lua: Fuel add", float,  "%.3f"
-entry = lua_fuelMult, "Lua: Fuel mult", float,  "%.3f"
-entry = lua_clutchUpState, "lua_clutchUpState", int,    "%d"
-entry = lua_brakePedalState, "lua_brakePedalState", int,    "%d"
-entry = lua_acRequestState, "lua_acRequestState", int,    "%d"
-entry = lua_luaDisableEtb, "lua_luaDisableEtb", int,    "%d"
-entry = lua_luaIgnCut, "lua_luaIgnCut", int,    "%d"
-entry = sd_tCharge, "Air: Charge temperature estimate", float,  "%.3f"
-entry = sd_tChargeK, "Air: Charge temperature estimate K", float,  "%.3f"
-entry = crankingFuel_coolantTemperatureCoefficient, "Fuel: cranking CLT mult", float,  "%.3f"
-entry = crankingFuel_tpsCoefficient, "Fuel: cranking TPS mult", float,  "%.3f"
-entry = crankingFuel_durationCoefficient, "Fuel: cranking duration mult", float,  "%.3f"
-entry = crankingFuel_fuel, "Fuel: Cranking cycle mass", float,  "%.3f"
-entry = baroCorrection, "Fuel: Barometric pressure mult", float,  "%.3f"
-entry = hellenBoardId, "Detected Board ID", int,    "%d"
-entry = clutchUpState, "Clutch: up", int,    "%d"
-entry = clutchDownState, "Clutch: down", int,    "%d"
-entry = brakePedalState, "Brake switch", int,    "%d"
-entry = startStopState, "startStopState", int,    "%d"
-entry = startStopStateToggleCounter, "startStopStateToggleCounter", int,    "%d"
-entry = egtValue1, "egtValue1", float,  "%.3f"
-entry = egtValue2, "egtValue2", float,  "%.3f"
-entry = desiredRpmLimit, "User-defined RPM hard limit", int,    "%d"
-entry = fuelInjectionCounter, "Fuel: Injection counter", int,    "%d"
-entry = sparkCounter, "Ign: Spark counter", int,    "%d"
-entry = fuelingLoad, "Fuel: Load", float,  "%.3f"
-entry = ignitionLoad, "Ign: Load", float,  "%.3f"
-entry = veTableYAxis, "veTableYAxis", float,  "%.3f"
-entry = tpsFrom, "Fuel: TPS AE from", float,  "%.3f"
-entry = tpsTo, "Fuel: TPS AE to", float,  "%.3f"
-entry = deltaTps, "Fuel: TPS AE change", float,  "%.3f"
-entry = extraFuel, "extraFuel", float,  "%.3f"
-entry = valueFromTable, "valueFromTable", float,  "%.3f"
-entry = isAboveAccelThreshold, "Fuel: TPS AE Active", int,    "%d"
-entry = isBelowDecelThreshold, "isBelowDecelThreshold", int,    "%d"
-entry = isTimeToResetAccumulator, "Accel: reset time", int,    "%d"
-entry = isFractionalEnrichment, "isFractionalEnrichment", int,    "%d"
-entry = belowEpsilon, "Accel: below threshold", int,    "%d"
-entry = tooShort, "Accel: too short", int,    "%d"
-entry = fractionalInjFuel, "fractionalInjFuel", float,  "%.3f"
-entry = accumulatedValue, "accumulatedValue", float,  "%.3f"
-entry = maxExtraPerCycle, "maxExtraPerCycle", float,  "%.3f"
-entry = maxExtraPerPeriod, "maxExtraPerPeriod", float,  "%.3f"
-entry = maxInjectedPerPeriod, "maxInjectedPerPeriod", float,  "%.3f"
-entry = cycleCnt, "cycleCnt", int,    "%d"
-entry = hwEventCounters1, "Hardware events since boot 1", int,    "%d"
-entry = hwEventCounters2, "Hardware events since boot 2", int,    "%d"
-entry = hwEventCounters3, "Hardware events since boot 3", int,    "%d"
-entry = hwEventCounters4, "Hardware events since boot 4", int,    "%d"
-entry = hwEventCounters5, "Hardware events since boot 5", int,    "%d"
-entry = hwEventCounters6, "Hardware events since boot 6", int,    "%d"
-entry = vvtCamCounter, "Sync: total cams front counter", int,    "%d"
-entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float,  "%.3f"
-entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float,  "%.3f"
-entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int,    "%d"
-entry = mapVvt_map_peak, "mapVvt_map_peak", int,    "%d"
-entry = currentEngineDecodedPhase, "Sync: Engine Phase", float,  "%.3f"
-entry = triggerToothAngleError, "Sync: trigger angle error", float,  "%.3f"
-entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int,    "%d"
-entry = crankSynchronizationCounter, "sync: Crank sync counter", int,    "%d"
-entry = vvtSyncGapRatio, "vvtSyncGapRatio", float,  "%.3f"
-entry = vvtToothDurations0, "vvtToothDurations0", int,    "%d"
-entry = vvtCurrentPosition, "vvtCurrentPosition", float,  "%.3f"
-entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float,  "%.3f"
-entry = triggerStateIndex, "triggerStateIndex", int,    "%d"
-entry = vvtCounter, "vvtCounter", int,    "%d"
-entry = camResyncCounter, "camResyncCounter", int,    "%d"
-entry = vvtStateIndex, "vvtStateIndex", int,    "%d"
-entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int,    "%d"
-entry = wallFuelCorrection, "fuel wallwetting injection time", float,  "%.3f"
-entry = wallFuel, "Fuel on the wall", float,  "%.3f"
-entry = idleState, "idleState", int,    "%d"
-entry = currentIdlePosition, "idle: current position", float,  "%.3f"
-entry = baseIdlePosition, "idle: base value", float,  "%.3f"
-entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float,  "%.3f"
-entry = throttlePedalUpState, "idle: throttlePedalUpState", int,    "%d"
-entry = mightResetPid, "idle: mightResetPid", int,    "%d"
-entry = shouldResetPid, "idle: shouldResetPid", int,    "%d"
-entry = wasResetPid, "idle: wasResetPid", int,    "%d"
-entry = mustResetPid, "idle: mustResetPid", int,    "%d"
-entry = isCranking, "idle: cranking", int,    "%d"
-entry = isIacTableForCoasting, "isIacTableForCoasting", int,    "%d"
-entry = notIdling, "notIdling", int,    "%d"
-entry = needReset, "idle: reset", int,    "%d"
-entry = isInDeadZone, "idle: dead zone", int,    "%d"
-entry = isBlipping, "isBlipping", int,    "%d"
-entry = useClosedLoop, "useClosedLoop", int,    "%d"
-entry = badTps, "badTps", int,    "%d"
-entry = looksLikeRunning, "looksLikeRunning", int,    "%d"
-entry = looksLikeCoasting, "looksLikeCoasting", int,    "%d"
-entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int,    "%d"
-entry = isVerboseIAC, "isVerboseIAC", int,    "%d"
-entry = isIdleCoasting, "idle: coasting", int,    "%d"
-entry = targetRpmByClt, "idle: target by CLT", int,    "%d"
-entry = targetRpmAcBump, "idle: A/C bump", int,    "%d"
-entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float,  "%.3f"
-entry = luaAdd, "idle: Lua Adder", float,  "%.3f"
-entry = idlePosition, "ETB: idlePosition", float,  "%.3f"
-entry = trim, "ETB: trim", float,  "%.3f"
-entry = luaAdjustment, "ETB: luaAdjustment", float,  "%.3f"
-entry = m_wastegatePosition, "DC: wastegatePosition", float,  "%.3f"
-entry = etbFeedForward, "etbFeedForward", float,  "%.3f"
-entry = etbIntegralError, "etbIntegralError", float,  "%.3f"
-entry = etbCurrentTarget, "etbCurrentTarget", float,  "%.3f"
-entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float,  "%.3f"
-entry = etbRevLimitActive, "etbRevLimitActive", int,    "%d"
-entry = jamDetected, "jamDetected", int,    "%d"
-entry = etbDutyRateOfChange, "ETB duty rate of change", float,  "%.3f"
-entry = etbDutyAverage, "ETB average duty", float,  "%.3f"
-entry = etbTpsErrorCounter, "ETB TPS error counter", int,    "%d"
-entry = etbPpsErrorCounter, "ETB pedal error counter", int,    "%d"
-entry = etbErrorCode, "etbErrorCode", int,    "%d"
-entry = jamTimer, "ETB jam timer", float,  "%.3f"
-entry = faultCode, "WBO: Fault code", int,    "%d"
-entry = heaterDuty, "WBO: Heater duty", int,    "%d"
-entry = pumpDuty, "WBO: Pump duty", int,    "%d"
-entry = tempC, "WBO: Temperature", int,    "%d"
-entry = nernstVoltage, "WBO: Nernst Voltage", float,  "%.3f"
-entry = esr, "WBO: ESR", int,    "%d"
-entry = dcOutput0, "DC: output0", float,  "%.3f"
-entry = isEnabled0_int, "DC: en0", int,    "%d"
-entry = isEnabled0, "isEnabled0", int,    "%d"
-entry = value0, "ETB: SENT value0", int,    "%d"
-entry = value1, "ETB: SENT value1", int,    "%d"
-entry = errorRate, "ETB: SENT error rate", float,  "%.3f"
 
 
 [Menu]