diff --git a/firmware/controllers/actuators/idle_state_generated.h b/firmware/controllers/actuators/idle_state_generated.h index 1b3aaa79a0..55c3e3ecd0 100644 --- a/firmware/controllers/actuators/idle_state_generated.h +++ b/firmware/controllers/actuators/idle_state_generated.h @@ -115,8 +115,11 @@ struct idle_state_s { // Idle: Lua Adder // offset 44 float luaAdd = (float)0; + // IdleRpm: Lua Adder + // offset 48 + float luaAddRpm = (float)0; }; -static_assert(sizeof(idle_state_s) == 48); +static_assert(sizeof(idle_state_s) == 52); static_assert(offsetof(idle_state_s, currentIdlePosition) == 4); static_assert(offsetof(idle_state_s, baseIdlePosition) == 8); static_assert(offsetof(idle_state_s, idleClosedLoop) == 12); @@ -127,4 +130,5 @@ static_assert(offsetof(idle_state_s, targetRpmByClt) == 32); static_assert(offsetof(idle_state_s, targetRpmAcBump) == 36); static_assert(offsetof(idle_state_s, iacByRpmTaper) == 40); static_assert(offsetof(idle_state_s, luaAdd) == 44); +static_assert(offsetof(idle_state_s, luaAddRpm) == 48); diff --git a/firmware/tunerstudio/generated/fome_alphax-2chan.ini b/firmware/tunerstudio/generated/fome_alphax-2chan.ini index 1ce28e1e1b..d01a1f7a78 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.04.09.alphax-2chan.78645662" + signature = "rusEFI (FOME) master.2024.04.10.alphax-2chan.1299876810" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.alphax-2chan.78645662" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.alphax-2chan.1299876810" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5869,6 +5871,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_alphax-4chan.ini b/firmware/tunerstudio/generated/fome_alphax-4chan.ini index ed76e6ff2e..b2aeb23e94 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.04.09.alphax-4chan.2390232063" + signature = "rusEFI (FOME) master.2024.04.10.alphax-4chan.3350366635" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.alphax-4chan.2390232063" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.alphax-4chan.3350366635" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_alphax-8chan.ini b/firmware/tunerstudio/generated/fome_alphax-8chan.ini index 5328331eb7..8105062188 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.04.09.alphax-8chan.4139977990" + signature = "rusEFI (FOME) master.2024.04.10.alphax-8chan.3205074770" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.alphax-8chan.4139977990" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.alphax-8chan.3205074770" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_atlas.ini b/firmware/tunerstudio/generated/fome_atlas.ini index 6a101bd5d6..47fb203dd1 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.04.09.atlas.1988203193" + signature = "rusEFI (FOME) master.2024.04.10.atlas.1061884141" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.atlas.1988203193" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.atlas.1061884141" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5871,6 +5873,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_core48.ini b/firmware/tunerstudio/generated/fome_core48.ini index fb82631aee..6b6199e449 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.04.09.core48.1051788844" + signature = "rusEFI (FOME) master.2024.04.10.core48.2004583544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.core48.1051788844" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.core48.2004583544" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5873,6 +5875,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_core8.ini b/firmware/tunerstudio/generated/fome_core8.ini index 79a9db1a3a..5d7b78574c 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.04.09.core8.432538607" + signature = "rusEFI (FOME) master.2024.04.10.core8.1342341563" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.core8.432538607" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.core8.1342341563" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5873,6 +5875,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_f407-discovery.ini b/firmware/tunerstudio/generated/fome_f407-discovery.ini index eb3d2dc25f..081f65619b 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.04.09.f407-discovery.3231813433" + signature = "rusEFI (FOME) master.2024.04.10.f407-discovery.2305494381" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.f407-discovery.3231813433" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.f407-discovery.2305494381" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5873,6 +5875,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_f429-discovery.ini b/firmware/tunerstudio/generated/fome_f429-discovery.ini index 581341e551..f433f8dc9a 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.04.09.f429-discovery.569314905" + signature = "rusEFI (FOME) master.2024.04.10.f429-discovery.1747291149" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.f429-discovery.569314905" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.f429-discovery.1747291149" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5871,6 +5873,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_frankenso_na6.ini b/firmware/tunerstudio/generated/fome_frankenso_na6.ini index 8b675f5ab4..c80f152a0f 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.04.09.frankenso_na6.62779027" + signature = "rusEFI (FOME) master.2024.04.10.frankenso_na6.1249340615" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.frankenso_na6.62779027" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.frankenso_na6.1249340615" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5871,6 +5873,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_harley81.ini b/firmware/tunerstudio/generated/fome_harley81.ini index 8b547b037a..6a6ed7c17f 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.04.09.harley81.2826581539" + signature = "rusEFI (FOME) master.2024.04.10.harley81.3786454135" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.harley81.2826581539" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.harley81.3786454135" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini index 945b2be724..55b15a08dc 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.04.09.hellen-gm-e67.1216749706" + signature = "rusEFI (FOME) master.2024.04.10.hellen-gm-e67.21799646" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen-gm-e67.1216749706" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen-gm-e67.21799646" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini index b92b235f3d..76a4d4f2d7 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.04.09.hellen-honda-k.3541561035" + signature = "rusEFI (FOME) master.2024.04.10.hellen-honda-k.2598202527" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen-honda-k.3541561035" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen-honda-k.2598202527" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen-nb1.ini b/firmware/tunerstudio/generated/fome_hellen-nb1.ini index 86fd8caa82..a098008ef9 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.04.09.hellen-nb1.3603439589" + signature = "rusEFI (FOME) master.2024.04.10.hellen-nb1.2667748785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen-nb1.3603439589" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen-nb1.2667748785" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen121nissan.ini b/firmware/tunerstudio/generated/fome_hellen121nissan.ini index 9c62fd5762..1a3b63e2a5 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.04.09.hellen121nissan.2786309039" + signature = "rusEFI (FOME) master.2024.04.10.hellen121nissan.4023988731" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen121nissan.2786309039" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen121nissan.4023988731" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen121vag.ini b/firmware/tunerstudio/generated/fome_hellen121vag.ini index 82a3b58ff5..05b90917f4 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.04.09.hellen121vag.168868988" + signature = "rusEFI (FOME) master.2024.04.10.hellen121vag.1138376232" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen121vag.168868988" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen121vag.1138376232" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen128.ini b/firmware/tunerstudio/generated/fome_hellen128.ini index 260f5504ac..8f04e03b54 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.04.09.hellen128.2709352446" + signature = "rusEFI (FOME) master.2024.04.10.hellen128.3904368042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen128.2709352446" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen128.3904368042" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini index d2323b1597..a8b4b5f6cb 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.04.09.hellen154hyundai.898256671" + signature = "rusEFI (FOME) master.2024.04.10.hellen154hyundai.2084621643" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen154hyundai.898256671" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen154hyundai.2084621643" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen72.ini b/firmware/tunerstudio/generated/fome_hellen72.ini index 928315fd89..da6c413c61 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.04.09.hellen72.3495663598" + signature = "rusEFI (FOME) master.2024.04.10.hellen72.2576422330" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen72.3495663598" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen72.2576422330" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen81.ini b/firmware/tunerstudio/generated/fome_hellen81.ini index a677da8593..1efa30b18a 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.04.09.hellen81.2094132588" + signature = "rusEFI (FOME) master.2024.04.10.hellen81.890990392" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen81.2094132588" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen81.890990392" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5870,6 +5872,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellen88bmw.ini b/firmware/tunerstudio/generated/fome_hellen88bmw.ini index 3b8a0674ee..dc157cdcf2 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.04.09.hellen88bmw.2062154335" + signature = "rusEFI (FOME) master.2024.04.10.hellen88bmw.857962507" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellen88bmw.2062154335" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellen88bmw.857962507" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellenNA6.ini b/firmware/tunerstudio/generated/fome_hellenNA6.ini index b3761dbf62..7d96ad00b0 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.04.09.hellenNA6.845107166" + signature = "rusEFI (FOME) master.2024.04.10.hellenNA6.2073415050" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellenNA6.845107166" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellenNA6.2073415050" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini index b5586e0cbe..55adf171e3 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.04.09.hellenNA8_96.2398828654" + signature = "rusEFI (FOME) master.2024.04.10.hellenNA8_96.3341924922" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.hellenNA8_96.2398828654" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.hellenNA8_96.3341924922" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5872,6 +5874,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_mre_f4.ini b/firmware/tunerstudio/generated/fome_mre_f4.ini index 959efe737b..e1850921c6 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.04.09.mre_f4.3328273377" + signature = "rusEFI (FOME) master.2024.04.10.mre_f4.2410408373" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.mre_f4.3328273377" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.mre_f4.2410408373" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4985,6 +4986,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5874,6 +5876,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_mre_f7.ini b/firmware/tunerstudio/generated/fome_mre_f7.ini index def8da03fa..d4a5acdc56 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.04.09.mre_f7.3328273377" + signature = "rusEFI (FOME) master.2024.04.10.mre_f7.2410408373" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.mre_f7.3328273377" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.mre_f7.2410408373" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4985,6 +4986,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5874,6 +5876,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_prometheus_405.ini b/firmware/tunerstudio/generated/fome_prometheus_405.ini index 0212de12c5..7121b81d7d 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.04.09.prometheus_405.293323721" + signature = "rusEFI (FOME) master.2024.04.10.prometheus_405.1488011677" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.prometheus_405.293323721" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.prometheus_405.1488011677" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5866,6 +5868,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_prometheus_469.ini b/firmware/tunerstudio/generated/fome_prometheus_469.ini index d8590405b5..b1c374c94d 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.04.09.prometheus_469.293323721" + signature = "rusEFI (FOME) master.2024.04.10.prometheus_469.1488011677" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.prometheus_469.293323721" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.prometheus_469.1488011677" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5866,6 +5868,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_proteus_f4.ini b/firmware/tunerstudio/generated/fome_proteus_f4.ini index a2e19c2b30..8b50ab1eab 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.04.09.proteus_f4.2077597580" + signature = "rusEFI (FOME) master.2024.04.10.proteus_f4.840900056" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.proteus_f4.2077597580" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.proteus_f4.840900056" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 26660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5868,6 +5870,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_proteus_f7.ini b/firmware/tunerstudio/generated/fome_proteus_f7.ini index 36e483025b..233aad7b8a 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.04.09.proteus_f7.2077597580" + signature = "rusEFI (FOME) master.2024.04.10.proteus_f7.840900056" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.proteus_f7.2077597580" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.proteus_f7.840900056" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 26660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5868,6 +5870,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_proteus_h7.ini b/firmware/tunerstudio/generated/fome_proteus_h7.ini index ce40585879..e3e61c53d2 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.04.09.proteus_h7.2077597580" + signature = "rusEFI (FOME) master.2024.04.10.proteus_h7.840900056" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.proteus_h7.2077597580" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.proteus_h7.840900056" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 26660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5868,6 +5870,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_small-can-board.ini b/firmware/tunerstudio/generated/fome_small-can-board.ini index 459f532caa..06f077ff39 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.04.09.small-can-board.3380812231" + signature = "rusEFI (FOME) master.2024.04.10.small-can-board.2152307603" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.small-can-board.3380812231" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.small-can-board.2152307603" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 39660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5870,6 +5872,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" diff --git a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini index 88d8502135..61aed627c2 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.04.09.tdg-pdm8.2873172603" + signature = "rusEFI (FOME) master.2024.04.10.tdg-pdm8.3800801327" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.04.09.tdg-pdm8.2873172603" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.04.10.tdg-pdm8.3800801327" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -2226,7 +2226,7 @@ dwellVoltageCorrValues = array, U08, 22660, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1384 + ochBlockSize = 1388 ; ; see TunerStudioOutputChannels struct @@ -2932,50 +2932,51 @@ targetRpmByClt = scalar, S32, 1260, "", 1, 0 targetRpmAcBump = scalar, S32, 1264, "", 1, 0 iacByRpmTaper = scalar, F32, 1268 luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 +luaAddRpm = scalar, F32, 1276 +; total TS size = 1280 +idlePosition = scalar, F32, 1280, "per", 1, 0 +trim = scalar, F32, 1284, "", 1, 0 +luaAdjustment = scalar, F32, 1288, "per", 1, 0 +m_wastegatePosition = scalar, F32, 1292, "per", 1, 0 +etbFeedForward = scalar, F32, 1296 +etbIntegralError = scalar, F32, 1300, "", 1, 0 +etbCurrentTarget = scalar, F32, 1304, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1308, "%", 1, 0 +etbRevLimitActive = bits, U32, 1312, [0:0] +jamDetected = bits, U32, 1312, [1:1] +etbDutyRateOfChange = scalar, F32, 1316, "per", 1, 0 +etbDutyAverage = scalar, F32, 1320, "per", 1, 0 +etbTpsErrorCounter = scalar, U16, 1324, "count", 1, 0 +etbPpsErrorCounter = scalar, U16, 1326, "count", 1, 0 +etbErrorCode = scalar, S08, 1328, "", 1, 0 +jamTimer = scalar, U16, 1330, "sec", 0.01, 0 +; total TS size = 1332 +faultCode = scalar, U08, 1332, "", 1, 0 +heaterDuty = scalar, U08, 1333, "%", 1, 0 +pumpDuty = scalar, U08, 1334, "%", 1, 0 +tempC = scalar, U16, 1336, "C", 1, 0 +nernstVoltage = scalar, U16, 1338, "V", 0.001, 0 +esr = scalar, U16, 1340, "ohm", 1, 0 +; total TS size = 1344 +dcOutput0 = scalar, F32, 1344, "per", 1, 0 +isEnabled0_int = scalar, U08, 1348, "per", 1, 0 +isEnabled0 = bits, U32, 1352, [0:0] +; total TS size = 1356 +value0 = scalar, U16, 1356, "value", 1, 0 +value1 = scalar, U16, 1358, "value", 1, 0 +errorRate = scalar, F32, 1360, "ratio", 1, 0 +; total TS size = 1364 +throttleUseWotModel = bits, U32, 1364, [0:0] +throttleModelCrossoverAngle = scalar, S16, 1368, "%", 0.01, 0 +throttleEstimatedFlow = scalar, F32, 1372, "g/s", 1, 0 ; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 +vvtTarget = scalar, U16, 1376, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1378, "%", 0.5, 0 +; total TS size = 1380 +lambdaCurrentlyGood = bits, U32, 1380, [0:0] +lambdaMonitorCut = bits, U32, 1380, [1:1] +lambdaTimeSinceGood = scalar, U16, 1384, "sec", 0.01, 0 +; total TS size = 1388 time = { timeNow } @@ -4984,6 +4985,7 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "Idle: Lua Adder", float, "%.3f" +entry = luaAddRpm, "IdleRpm: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" entry = trim, "ETB: trim", float, "%.3f" entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" @@ -5871,6 +5873,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = targetRpmAcBump graphLine = iacByRpmTaper graphLine = luaAdd + graphLine = luaAddRpm indicatorPanel = electronic_throttleIndicatorPanel, 2 indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive 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 d3df3289b8..e1f7c3c8c7 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 @@ -1178,10 +1178,10 @@ 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.04.09.f407-discovery.3231813433"; + public static final String TS_SIGNATURE = "rusEFI (FOME) master.2024.04.10.f407-discovery.2305494381"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1384; + public static final int TS_TOTAL_OUTPUT_SIZE = 1388; 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;