diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 3c4db46f7c..3b62f34105 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1937,7 +1937,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2862064706 +#define SIGNATURE_HASH 2637454054 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2489,12 +2489,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen_cypress.2862064706" +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen_cypress.2637454054" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 996 +#define TS_TOTAL_OUTPUT_SIZE 1012 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 33c7717b70..2e4c4f1a58 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1923,7 +1923,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 4107584463 +#define SIGNATURE_HASH 3279371627 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2475,12 +2475,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.30.kin.4107584463" +#define TS_SIGNATURE "rusEFI 2022.06.30.kin.3279371627" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 996 +#define TS_TOTAL_OUTPUT_SIZE 1012 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index b75f752fd4..a70de85f90 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1903,7 +1903,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3836351482 +#define SIGNATURE_HASH 3540643166 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2456,12 +2456,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.30.subaru_eg33_f7.3836351482" +#define TS_SIGNATURE "rusEFI 2022.06.30.subaru_eg33_f7.3540643166" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 996 +#define TS_TOTAL_OUTPUT_SIZE 1012 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 3da2be3457..b126c424be 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -282,6 +282,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -310,6 +312,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index ce41e372c9..7d59af250c 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -54,8 +54,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -105,6 +108,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -113,44 +118,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index b62b1da9b1..8d35f2e1f6 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -368,160 +368,165 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 7b55e3e99f..0eea8b754f 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -298,86 +298,89 @@ m_deadtime("m_deadtime", SensorCategory.SENSOR_INPUTS, FieldType.INT, 608, 1.0, pressureDelta("pressureDelta", SensorCategory.SENSOR_INPUTS, FieldType.INT, 612, 1.0, -1.0, -1.0, ""), pressureRatio("pressureRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 616, 1.0, -1.0, -1.0, ""), retardThresholdRpm("retardThresholdRpm", SensorCategory.SENSOR_INPUTS, FieldType.INT, 620, 1.0, -1.0, -1.0, ""), -openLoopPart("openLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 632, 1.0, -1.0, -1.0, ""), -boostControllerClosedLoopPart("Boost Closed Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 636, 0.5, -50.0, 50.0, "%"), -alignmentFill_at_9("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 637, 1.0, -20.0, 100.0, "units"), -boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 638, 0.03333333333333333, 0.0, 0.0, "kPa"), -latest_usage_ac_control("latest_usage_ac_control", SensorCategory.SENSOR_INPUTS, FieldType.INT, 644, 1.0, -1.0, -1.0, ""), -acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 648, 1.0, -1.0, -1.0, ""), -sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 664, 1.0, -1.0, -1.0, ""), -targetAFR("targetAFR", SensorCategory.SENSOR_INPUTS, FieldType.INT, 688, 1.0, -1.0, -1.0, ""), -engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 692, 1.0, -1.0, -1.0, ""), -minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 696, 1.0, -1.0, -1.0, ""), -currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 700, 1.0, -1.0, -1.0, ""), -tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 704, 1.0, -1.0, -1.0, ""), -tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 708, 1.0, -1.0, -1.0, ""), -currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 712, 1.0, -1.0, -1.0, ""), -injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 716, 1.0, -1.0, -1.0, ""), -baroCorrection("baroCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 720, 1.0, -1.0, -1.0, ""), -cranking("cranking", SensorCategory.SENSOR_INPUTS, FieldType.INT, 724, 1.0, -1.0, -1.0, ""), -running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 744, 1.0, -1.0, -1.0, ""), -sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 772, 1.0, -1.0, -1.0, ""), -dwellAngle("ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 776, 1.0, -1.0, -1.0, ""), -cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 780, 0.01, -20.0, 20.0, "deg"), -timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 782, 0.01, -20.0, 20.0, "deg"), -timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 784, 0.01, -20.0, 20.0, "deg"), -hellenBoardId("Detected Board ID", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 786, 1.0, 0.0, 3000.0, "id"), -tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 792, 1.0, -1.0, -1.0, ""), -tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 796, 1.0, -1.0, -1.0, ""), -deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 800, 1.0, -1.0, -1.0, ""), -extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 804, 1.0, -1.0, -1.0, ""), -valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 808, 1.0, -1.0, -1.0, ""), -fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 816, 1.0, -1.0, -1.0, ""), -accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 820, 1.0, -1.0, -1.0, ""), -maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 824, 1.0, -1.0, -1.0, ""), -maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 828, 1.0, -1.0, -1.0, ""), -maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 832, 1.0, -1.0, -1.0, ""), -cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), -hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), -hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), -hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), -hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 852, 1.0, -1.0, -1.0, ""), -hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 856, 1.0, -1.0, -1.0, ""), -hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), -vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 864, 1.0, -1.0, -1.0, ""), -mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 868, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 872, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 876, 1.0, -10000.0, 10000.0, ""), -mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 877, 1.0, -10000.0, 10000.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 878, 1.0, -20.0, 100.0, "units"), -totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 880, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 884, 1.0, -10000.0, 10000.0, ""), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 888, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 892, 1.0, -10000.0, 10000.0, ""), -triggerActualSyncGapRatio("triggerActualSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 896, 1.0, -1.0, -1.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 900, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 901, 1.0, -1.0, -1.0, ""), -vvtSyncCounter("vvtSyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 902, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 903, 1.0, -1.0, -1.0, ""), -wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -1.0, -1.0, ""), -wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -1.0, -1.0, ""), -currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -1.0, -1.0, ""), -baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 920, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), -targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 952, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 984, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 985, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 986, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 987, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 988, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 990, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 992, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 994, 1.0, -20.0, 100.0, "units"), +loadTargetAdd("loadTargetAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 632, 1.0, -1.0, -1.0, ""), +loadTargetMult("loadTargetMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 636, 1.0, -1.0, -1.0, ""), +openLoopPart("openLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 640, 1.0, -1.0, -1.0, ""), +boostControllerClosedLoopPart("Boost Closed Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 644, 0.5, -50.0, 50.0, "%"), +alignmentFill_at_17("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 645, 1.0, -20.0, 100.0, "units"), +boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 646, 0.03333333333333333, 0.0, 0.0, "kPa"), +latest_usage_ac_control("latest_usage_ac_control", SensorCategory.SENSOR_INPUTS, FieldType.INT, 652, 1.0, -1.0, -1.0, ""), +acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 656, 1.0, -1.0, -1.0, ""), +lua("lua", SensorCategory.SENSOR_INPUTS, FieldType.INT, 672, 1.0, -1.0, -1.0, ""), +sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 680, 1.0, -1.0, -1.0, ""), +targetAFR("targetAFR", SensorCategory.SENSOR_INPUTS, FieldType.INT, 704, 1.0, -1.0, -1.0, ""), +engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 708, 1.0, -1.0, -1.0, ""), +minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 712, 1.0, -1.0, -1.0, ""), +currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 716, 1.0, -1.0, -1.0, ""), +tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 720, 1.0, -1.0, -1.0, ""), +tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 724, 1.0, -1.0, -1.0, ""), +currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 728, 1.0, -1.0, -1.0, ""), +injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 732, 1.0, -1.0, -1.0, ""), +baroCorrection("baroCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 736, 1.0, -1.0, -1.0, ""), +cranking("cranking", SensorCategory.SENSOR_INPUTS, FieldType.INT, 740, 1.0, -1.0, -1.0, ""), +running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 760, 1.0, -1.0, -1.0, ""), +sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 788, 1.0, -1.0, -1.0, ""), +dwellAngle("ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 792, 1.0, -1.0, -1.0, ""), +cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 796, 0.01, -20.0, 20.0, "deg"), +timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 798, 0.01, -20.0, 20.0, "deg"), +timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 800, 0.01, -20.0, 20.0, "deg"), +hellenBoardId("Detected Board ID", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 802, 1.0, 0.0, 3000.0, "id"), +tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 808, 1.0, -1.0, -1.0, ""), +tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 812, 1.0, -1.0, -1.0, ""), +deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 816, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 820, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 824, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 832, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 852, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 856, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 864, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 868, 1.0, -1.0, -1.0, ""), +hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 872, 1.0, -1.0, -1.0, ""), +hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 876, 1.0, -1.0, -1.0, ""), +vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 880, 1.0, -1.0, -1.0, ""), +mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 884, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 888, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 892, 1.0, -10000.0, 10000.0, ""), +mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 893, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 894, 1.0, -20.0, 100.0, "units"), +totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 896, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 900, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -10000.0, 10000.0, ""), +triggerActualSyncGapRatio("triggerActualSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -1.0, -1.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 916, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 917, 1.0, -1.0, -1.0, ""), +vvtSyncCounter("vvtSyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 918, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 919, 1.0, -1.0, -1.0, ""), +wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 920, 1.0, -1.0, -1.0, ""), +wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), +currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -1.0, -1.0, ""), +baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), +targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 952, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1000, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1001, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1002, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1003, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1004, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1006, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1008, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1010, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index e1c2e89428..d601e0eb7b 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / UsagesReader.java -#define TS_TOTAL_OUTPUT_SIZE 996 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1012 \ No newline at end of file diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index fee0843cb9..4ac38e91a2 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1937,7 +1937,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 4022069832 +#define SIGNATURE_HASH 3625456876 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2489,12 +2489,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.30.all.4022069832" +#define TS_SIGNATURE "rusEFI 2022.06.30.all.3625456876" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 996 +#define TS_TOTAL_OUTPUT_SIZE 1012 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 2e122ef3ef..4c8dc4e62b 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4171031047 -#define TS_SIGNATURE "rusEFI 2022.06.30.48way.4171031047" +#define SIGNATURE_HASH 3477019811 +#define TS_SIGNATURE "rusEFI 2022.06.30.48way.3477019811" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 6df3f42688..af662df31c 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4022069832 -#define TS_SIGNATURE "rusEFI 2022.06.30.all.4022069832" +#define SIGNATURE_HASH 3625456876 +#define TS_SIGNATURE "rusEFI 2022.06.30.all.3625456876" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 86dee05fb4..e682be93ac 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3718870820 -#define TS_SIGNATURE "rusEFI 2022.06.30.alphax-2chan.3718870820" +#define SIGNATURE_HASH 3926559104 +#define TS_SIGNATURE "rusEFI 2022.06.30.alphax-2chan.3926559104" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index de8fdbc1cd..02baf8aa95 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3426157835 -#define TS_SIGNATURE "rusEFI 2022.06.30.alphax-4chan.3426157835" +#define SIGNATURE_HASH 4220844975 +#define TS_SIGNATURE "rusEFI 2022.06.30.alphax-4chan.4220844975" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 91fc27896b..b3536cc708 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4084277103 -#define TS_SIGNATURE "rusEFI 2022.06.30.atlas.4084277103" +#define SIGNATURE_HASH 3302154699 +#define TS_SIGNATURE "rusEFI 2022.06.30.atlas.3302154699" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index ae3cc9af7c..59e9eb608a 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 425180081 -#define TS_SIGNATURE "rusEFI 2022.06.30.core8.425180081" +#define SIGNATURE_HASH 787760405 +#define TS_SIGNATURE "rusEFI 2022.06.30.core8.787760405" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 7d881031c9..7ea46e22f8 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4022069832 -#define TS_SIGNATURE "rusEFI 2022.06.30.f407-discovery.4022069832" +#define SIGNATURE_HASH 3625456876 +#define TS_SIGNATURE "rusEFI 2022.06.30.f407-discovery.3625456876" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 624e3a1c5f..05a63a31b0 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4022069832 -#define TS_SIGNATURE "rusEFI 2022.06.30.f429-discovery.4022069832" +#define SIGNATURE_HASH 3625456876 +#define TS_SIGNATURE "rusEFI 2022.06.30.f429-discovery.3625456876" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0963cecbaf..b60d4aab9f 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2916554380 -#define TS_SIGNATURE "rusEFI 2022.06.30.frankenso_na6.2916554380" +#define SIGNATURE_HASH 2591352872 +#define TS_SIGNATURE "rusEFI 2022.06.30.frankenso_na6.2591352872" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 96983ddc28..7d6dd7d206 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2606216503 -#define TS_SIGNATURE "rusEFI 2022.06.30.harley81.2606216503" +#define SIGNATURE_HASH 2901691283 +#define TS_SIGNATURE "rusEFI 2022.06.30.harley81.2901691283" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 8555bcc2fb..a998ad2fb5 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3467967277 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen-gm-e67.3467967277" +#define SIGNATURE_HASH 4179035529 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen-gm-e67.4179035529" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 41c5fd7d19..c38a5e9d19 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 909171588 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen-nb1.909171588" +#define SIGNATURE_HASH 26420512 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen-nb1.26420512" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 2de709b395..c8bb3b8fc9 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1734693538 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen121nissan.1734693538" +#define SIGNATURE_HASH 1355197446 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen121nissan.1355197446" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 25732cf890..9d026c9c39 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2677680434 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen121vag.2677680434" +#define SIGNATURE_HASH 2822363030 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen121vag.2822363030" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 34d924a975..f07fba45a3 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2173712025 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen128.2173712025" +#define SIGNATURE_HASH 3056846909 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen128.3056846909" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 4e912b5977..be4dc1a258 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2012518604 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen154hyundai.2012518604" +#define SIGNATURE_HASH 1079469672 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen154hyundai.1079469672" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index e5e8cce28c..86062f7e44 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 495240012 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen72.495240012" +#define SIGNATURE_HASH 707214824 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen72.707214824" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 78173e8fd3..e1af764b15 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3440259650 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen81.3440259650" +#define SIGNATURE_HASH 4205694182 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen81.4205694182" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index b3b1537f9d..ac765f5fe0 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3006016748 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen88bmw.3006016748" +#define SIGNATURE_HASH 2224017992 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen88bmw.2224017992" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 9cc3050f9f..0bad02d2fc 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1831869224 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellenNA6.1831869224" +#define SIGNATURE_HASH 1519641996 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellenNA6.1519641996" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 80b06373b3..dca13b8870 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3976343672 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellenNA8_96.3976343672" +#define SIGNATURE_HASH 3668037340 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellenNA8_96.3668037340" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index ed64084a35..4d766a2caf 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 2862064706 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen_cypress.2862064706" +#define SIGNATURE_HASH 2637454054 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen_cypress.2637454054" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 44ec673342..1ad6994770 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 4107584463 -#define TS_SIGNATURE "rusEFI 2022.06.30.kin.4107584463" +#define SIGNATURE_HASH 3279371627 +#define TS_SIGNATURE "rusEFI 2022.06.30.kin.3279371627" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index dea0105615..6d96098d66 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 544040638 -#define TS_SIGNATURE "rusEFI 2022.06.30.mre_f4.544040638" +#define SIGNATURE_HASH 399415322 +#define TS_SIGNATURE "rusEFI 2022.06.30.mre_f4.399415322" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 1cb5944b84..4b469fb2d7 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 544040638 -#define TS_SIGNATURE "rusEFI 2022.06.30.mre_f7.544040638" +#define SIGNATURE_HASH 399415322 +#define TS_SIGNATURE "rusEFI 2022.06.30.mre_f7.399415322" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ca0f95e59e..d8aa6b131a 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3209769902 -#define TS_SIGNATURE "rusEFI 2022.06.30.prometheus_405.3209769902" +#define SIGNATURE_HASH 2297613578 +#define TS_SIGNATURE "rusEFI 2022.06.30.prometheus_405.2297613578" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index e5676985c6..0c2b1eb9c2 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3209769902 -#define TS_SIGNATURE "rusEFI 2022.06.30.prometheus_469.3209769902" +#define SIGNATURE_HASH 2297613578 +#define TS_SIGNATURE "rusEFI 2022.06.30.prometheus_469.2297613578" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 174ae46ce2..163151b9fc 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1249258814 -#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_f4.1249258814" +#define SIGNATURE_HASH 2111165338 +#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_f4.2111165338" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 26ee4bec4d..ad18f3590c 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1249258814 -#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_f7.1249258814" +#define SIGNATURE_HASH 2111165338 +#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_f7.2111165338" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 7de45a6caf..14cd2bdf74 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1249258814 -#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_h7.1249258814" +#define SIGNATURE_HASH 2111165338 +#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_h7.2111165338" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index ce740464bf..9f3e0645d1 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 3836351482 -#define TS_SIGNATURE "rusEFI 2022.06.30.subaru_eg33_f7.3836351482" +#define SIGNATURE_HASH 3540643166 +#define TS_SIGNATURE "rusEFI 2022.06.30.subaru_eg33_f7.3540643166" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 594267535d..1bfa39ccbd 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1169368092 -#define TS_SIGNATURE "rusEFI 2022.06.30.tdg-pdm8.1169368092" +#define SIGNATURE_HASH 1913707192 +#define TS_SIGNATURE "rusEFI 2022.06.30.tdg-pdm8.1913707192" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index c719d19d2e..adb74cc2f2 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.all.4022069832" + signature = "rusEFI 2022.06.30.all.3625456876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.all.4022069832" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.all.3625456876" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:27:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:18 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4797,8 +4807,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4848,6 +4861,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4856,44 +4871,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 789948cc23..6f3c5deee8 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.48way.4171031047" + signature = "rusEFI 2022.06.30.48way.3477019811" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.48way.4171031047" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.48way.3477019811" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:00 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4794,8 +4804,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4845,6 +4858,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4853,44 +4868,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index cd2ab2ca2a..733b94c4c3 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.alphax-2chan.3718870820" + signature = "rusEFI 2022.06.30.alphax-2chan.3926559104" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.alphax-2chan.3718870820" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.alphax-2chan.3926559104" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:31 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4791,8 +4801,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4842,6 +4855,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4850,44 +4865,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 02cec94138..b2e37c52d0 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.alphax-4chan.3426157835" + signature = "rusEFI 2022.06.30.alphax-4chan.4220844975" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.alphax-4chan.3426157835" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.alphax-4chan.4220844975" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:33 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4792,8 +4802,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4843,6 +4856,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4851,44 +4866,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 72a3b5e36e..017c8fbff4 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.atlas.4084277103" + signature = "rusEFI 2022.06.30.atlas.3302154699" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.atlas.4084277103" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.atlas.3302154699" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:27:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:14 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4797,8 +4807,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4848,6 +4861,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4856,44 +4871,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 17265f032a..33b54f08f4 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.core8.425180081" + signature = "rusEFI 2022.06.30.core8.787760405" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.core8.425180081" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.core8.787760405" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:58 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4794,8 +4804,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4845,6 +4858,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4853,44 +4868,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index c128b0025f..c315d07654 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.f407-discovery.4022069832" + signature = "rusEFI 2022.06.30.f407-discovery.3625456876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.f407-discovery.4022069832" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.f407-discovery.3625456876" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:27:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:11 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4797,8 +4807,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4848,6 +4861,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4856,44 +4871,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 62377af5f2..174c9ce36d 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.f429-discovery.4022069832" + signature = "rusEFI 2022.06.30.f429-discovery.3625456876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.f429-discovery.4022069832" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.f429-discovery.3625456876" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:27:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:13 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4797,8 +4807,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4848,6 +4861,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4856,44 +4871,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index b9a340c94a..fc7b0c3099 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.frankenso_na6.2916554380" + signature = "rusEFI 2022.06.30.frankenso_na6.2591352872" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.frankenso_na6.2916554380" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.frankenso_na6.2591352872" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:01 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4797,8 +4807,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4848,6 +4861,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4856,44 +4871,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index e504f84e11..462b0d0f51 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.harley81.2606216503" + signature = "rusEFI 2022.06.30.harley81.2901691283" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.harley81.2606216503" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.harley81.2901691283" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:35 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index e157d4a85d..52ddb5ffcd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen-gm-e67.3467967277" + signature = "rusEFI 2022.06.30.hellen-gm-e67.4179035529" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen-gm-e67.3467967277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen-gm-e67.4179035529" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:50 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 3ea572851a..c890fe681c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen-nb1.909171588" + signature = "rusEFI 2022.06.30.hellen-nb1.26420512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen-nb1.909171588" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen-nb1.26420512" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:48 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 887c5991e2..1cbef40838 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen121nissan.1734693538" + signature = "rusEFI 2022.06.30.hellen121nissan.1355197446" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen121nissan.1734693538" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen121nissan.1355197446" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:40 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 8970a4029c..65987699f4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen121vag.2677680434" + signature = "rusEFI 2022.06.30.hellen121vag.2822363030" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen121vag.2677680434" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen121vag.2822363030" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:38 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 771a3d39ca..32e61afdbb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen128.2173712025" + signature = "rusEFI 2022.06.30.hellen128.3056846909" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen128.2173712025" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen128.3056846909" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:37 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 3f97ad8964..c2b65d2402 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen154hyundai.2012518604" + signature = "rusEFI 2022.06.30.hellen154hyundai.1079469672" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen154hyundai.2012518604" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen154hyundai.1079469672" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:41 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 31ae89d752..031dd15d92 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen72.495240012" + signature = "rusEFI 2022.06.30.hellen72.707214824" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen72.495240012" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen72.707214824" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:45 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index e12659d2dc..9624aecd4b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen81.3440259650" + signature = "rusEFI 2022.06.30.hellen81.4205694182" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen81.3440259650" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen81.4205694182" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:46 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4792,8 +4802,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4843,6 +4856,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4851,44 +4866,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 4051660154..af5cb74264 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen88bmw.3006016748" + signature = "rusEFI 2022.06.30.hellen88bmw.2224017992" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen88bmw.3006016748" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen88bmw.2224017992" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:43 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 63bec9c8e9..3f973911ae 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellenNA6.1831869224" + signature = "rusEFI 2022.06.30.hellenNA6.1519641996" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellenNA6.1831869224" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellenNA6.1519641996" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:51 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 7419fad389..d9d629bdc8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellenNA8_96.3976343672" + signature = "rusEFI 2022.06.30.hellenNA8_96.3668037340" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellenNA8_96.3976343672" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellenNA8_96.3668037340" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:53 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 494c0982b6..bebf636d4f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen_cypress.2862064706" + signature = "rusEFI 2022.06.30.hellen_cypress.2637454054" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen_cypress.2862064706" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen_cypress.2637454054" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jun 30 02:27:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jun 30 03:38:20 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4797,8 +4807,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4848,6 +4861,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4856,44 +4871,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index a12a6a6bd5..a81c252376 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.kin.4107584463" + signature = "rusEFI 2022.06.30.kin.3279371627" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.kin.4107584463" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.kin.3279371627" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jun 30 02:27:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jun 30 03:38:19 UTC 2022 pageSize = 21272 page = 1 @@ -2064,7 +2064,7 @@ tcu_32Vals = array, U08, 21264, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2440,163 +2440,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4066,6 +4071,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4094,6 +4101,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4758,8 +4768,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4809,6 +4822,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4817,44 +4832,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 9ced5f86a2..f57797777b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.mre_f4.544040638" + signature = "rusEFI 2022.06.30.mre_f4.399415322" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.mre_f4.544040638" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.mre_f4.399415322" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:56 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4794,8 +4804,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4845,6 +4858,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4853,44 +4868,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 2ee2700355..d74ce88b0c 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.mre_f7.544040638" + signature = "rusEFI 2022.06.30.mre_f7.399415322" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.mre_f7.544040638" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.mre_f7.399415322" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:55 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4794,8 +4804,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4845,6 +4858,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4853,44 +4868,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index ecc71c3edd..5436b36152 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.prometheus_405.3209769902" + signature = "rusEFI 2022.06.30.prometheus_405.2297613578" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.prometheus_405.3209769902" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.prometheus_405.2297613578" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:04 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4792,8 +4802,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4843,6 +4856,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4851,44 +4866,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 0e4941e074..3b11d066e3 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.prometheus_469.3209769902" + signature = "rusEFI 2022.06.30.prometheus_469.2297613578" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.prometheus_469.3209769902" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.prometheus_469.2297613578" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:03 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4792,8 +4802,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4843,6 +4856,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4851,44 +4866,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 2c2695db80..c09d2492e3 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.proteus_f4.1249258814" + signature = "rusEFI 2022.06.30.proteus_f4.2111165338" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.proteus_f4.1249258814" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.proteus_f4.2111165338" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:08 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4790,8 +4800,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4841,6 +4854,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4849,44 +4864,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 3fbfba176e..3d4731479e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.proteus_f7.1249258814" + signature = "rusEFI 2022.06.30.proteus_f7.2111165338" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.proteus_f7.1249258814" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.proteus_f7.2111165338" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:26:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:06 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4790,8 +4800,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4841,6 +4854,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4849,44 +4864,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index b6046f68fb..2dd0d9dd12 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.proteus_h7.1249258814" + signature = "rusEFI 2022.06.30.proteus_h7.2111165338" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.proteus_h7.1249258814" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.proteus_h7.2111165338" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:27:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:09 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4790,8 +4800,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4841,6 +4854,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4849,44 +4864,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 76492ae6e0..947bc6dd75 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.subaru_eg33_f7.3836351482" + signature = "rusEFI 2022.06.30.subaru_eg33_f7.3540643166" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.subaru_eg33_f7.3836351482" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.subaru_eg33_f7.3540643166" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Jun 30 02:27:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:22 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4793,8 +4803,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4844,6 +4857,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4852,44 +4867,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 5dc5ce2737..a51508c5fb 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.tdg-pdm8.1169368092" + signature = "rusEFI 2022.06.30.tdg-pdm8.1913707192" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.tdg-pdm8.1169368092" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.tdg-pdm8.1913707192" ; 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 @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:27:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:16 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 996 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2479,163 +2479,168 @@ m_shouldResetPid = bits, U32, 628, [1:1] isBelowClosedLoopThreshold = bits, U32, 628, [2:2] isNotClosedLoop = bits, U32, 628, [3:3] isZeroRpm = bits, U32, 628, [4:4] -openLoopPart = scalar, F32, 632, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 636, "%", 0.5, 0 -boostControlTarget = scalar, S16, 638, "kPa", 0.03333333333333333, 0 -; total TS size = 640 -engineTooSlow = bits, U32, 640, [0:0] -engineTooFast = bits, U32, 640, [1:1] -noClt = bits, U32, 640, [2:2] -engineTooHot = bits, U32, 640, [3:3] -tpsTooHigh = bits, U32, 640, [4:4] -m_acEnabled = bits, U32, 640, [5:5] -acButtonState = bits, U32, 640, [6:6] -isDisabledByLua = bits, U32, 640, [7:7] -latest_usage_ac_control = scalar, S32, 644, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 648, "", 1, 0 -; total TS size = 652 -cranking = bits, U32, 652, [0:0] -notRunning = bits, U32, 652, [1:1] -disabledWhileEngineStopped = bits, U32, 652, [2:2] -brokenClt = bits, U32, 652, [3:3] -enabledForAc = bits, U32, 652, [4:4] -hot = bits, U32, 652, [5:5] -cold = bits, U32, 652, [6:6] -; total TS size = 656 -isPrime = bits, U32, 656, [0:0] -engineTurnedRecently = bits, U32, 656, [1:1] -isPumpOn = bits, U32, 656, [2:2] -ignitionOn = bits, U32, 656, [3:3] +loadTargetAdd = scalar, F32, 632, "", 1, 0 +loadTargetMult = scalar, F32, 636, "", 1, 0 +openLoopPart = scalar, F32, 640, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 644, "%", 0.5, 0 +boostControlTarget = scalar, S16, 646, "kPa", 0.03333333333333333, 0 +; total TS size = 648 +engineTooSlow = bits, U32, 648, [0:0] +engineTooFast = bits, U32, 648, [1:1] +noClt = bits, U32, 648, [2:2] +engineTooHot = bits, U32, 648, [3:3] +tpsTooHigh = bits, U32, 648, [4:4] +m_acEnabled = bits, U32, 648, [5:5] +acButtonState = bits, U32, 648, [6:6] +isDisabledByLua = bits, U32, 648, [7:7] +latest_usage_ac_control = scalar, S32, 652, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 656, "", 1, 0 ; total TS size = 660 -isBenchTest = bits, U32, 660, [0:0] -hasIgnitionVoltage = bits, U32, 660, [1:1] -mainRelayState = bits, U32, 660, [2:2] -delayedShutoffRequested = bits, U32, 660, [3:3] +cranking = bits, U32, 660, [0:0] +notRunning = bits, U32, 660, [1:1] +disabledWhileEngineStopped = bits, U32, 660, [2:2] +brokenClt = bits, U32, 660, [3:3] +enabledForAc = bits, U32, 660, [4:4] +hot = bits, U32, 660, [5:5] +cold = bits, U32, 660, [6:6] ; total TS size = 664 -sd_isTChargeAirModel = bits, U32, 664, [0:0] -sd_airMassInOneCylinder = scalar, F32, 668, "", 1, 0 -sd_tCharge = scalar, F32, 672, "", 1, 0 -sd_tChargeK = scalar, F32, 676, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 680, "", 1, 0 -sd_airFlow = scalar, F32, 684, "", 1, 0 -targetAFR = scalar, F32, 688, "", 1, 0 -engineCycleDurationMs = scalar, F32, 692, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 696, "", 1, 0 -currentTpsAdc = scalar, S32, 700, "", 1, 0 -tpsVoltageMCU = scalar, F32, 704, "", 1, 0 -tpsVoltageBoard = scalar, F32, 708, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 712, "", 1, 0 -injectorFlowCorrection = scalar, F32, 716, "", 1, 0 -baroCorrection = scalar, F32, 720, "", 1, 0 -cranking_baseFuel = scalar, F32, 724, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 728, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 732, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 736, "", 1, 0 -cranking_fuel = scalar, F32, 740, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 744, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 748, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 752, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 756, "", 1, 0 -running_injectorLag = scalar, F32, 760, "", 1, 0 -running_baseFuel = scalar, F32, 764, "", 1, 0 -running_fuel = scalar, F32, 768, "", 1, 0 -sparkDwell = scalar, F32, 772, "", 1, 0 -dwellAngle = scalar, F32, 776, "", 1, 0 -cltTimingCorrection = scalar, S16, 780, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 782, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 784, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 786, "id", 1, 0 -clutchUpState = bits, U32, 788, [0:0] -clutchDownState = bits, U32, 788, [1:1] -brakePedalState = bits, U32, 788, [2:2] -; total TS size = 792 -tpsFrom = scalar, F32, 792, "", 1, 0 -tpsTo = scalar, F32, 796, "", 1, 0 -deltaTps = scalar, F32, 800, "", 1, 0 -extraFuel = scalar, F32, 804, "", 1, 0 -valueFromTable = scalar, F32, 808, "", 1, 0 -isAboveAccelThreshold = bits, U32, 812, [0:0] -isBelowDecelThreshold = bits, U32, 812, [1:1] -isTimeToResetAccumulator = bits, U32, 812, [2:2] -isFractionalEnrichment = bits, U32, 812, [3:3] -belowEpsilon = bits, U32, 812, [4:4] -tooShort = bits, U32, 812, [5:5] -fractionalInjFuel = scalar, F32, 816, "", 1, 0 -accumulatedValue = scalar, F32, 820, "", 1, 0 -maxExtraPerCycle = scalar, F32, 824, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 828, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 832, "", 1, 0 -cycleCnt = scalar, S32, 836, "", 1, 0 -; total TS size = 840 -hwEventCounters1 = scalar, S32, 840, "", 1, 0 -hwEventCounters2 = scalar, S32, 844, "", 1, 0 -hwEventCounters3 = scalar, S32, 848, "", 1, 0 -hwEventCounters4 = scalar, S32, 852, "", 1, 0 -hwEventCounters5 = scalar, S32, 856, "", 1, 0 -hwEventCounters6 = scalar, S32, 860, "", 1, 0 -vvtCamCounter = scalar, S32, 864, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 868, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 872, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 876, "", 1, 0 -mapVvt_map_peak = scalar, U08, 877, "", 1, 0 -; total TS size = 880 -totalRevolutionCounter = scalar, U32, 880, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 884, "", 1, 0 -vvtCurrentPosition = scalar, F32, 888, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 892, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 896, "", 1, 0 -triggerStateIndex = scalar, U08, 900, "", 1, 0 -vvtCounter = scalar, U08, 901, "", 1, 0 -vvtSyncCounter = scalar, U08, 902, "", 1, 0 -vvtStateIndex = scalar, U08, 903, "", 1, 0 -; total TS size = 904 -wallFuelCorrection = scalar, F32, 904, "", 1, 0 -wallFuel = scalar, F32, 908, "", 1, 0 -; total TS size = 912 -idleState = scalar, S32, 912, "", 1, 0 -currentIdlePosition = scalar, F32, 916, "", 1, 0 -baseIdlePosition = scalar, F32, 920, "", 1, 0 -iacByTpsTaper = scalar, F32, 924, "", 1, 0 -throttlePedalUpState = scalar, S32, 928, "", 1, 0 -mightResetPid = bits, U32, 932, [0:0] -shouldResetPid = bits, U32, 932, [1:1] -wasResetPid = bits, U32, 932, [2:2] -mustResetPid = bits, U32, 932, [3:3] -isCoasting = bits, U32, 932, [4:4] -useIacTableForCoasting = bits, U32, 932, [5:5] -notIdling = bits, U32, 932, [6:6] -needReset = bits, U32, 932, [7:7] -isInDeadZone = bits, U32, 932, [8:8] -isBlipping = bits, U32, 932, [9:9] -useClosedLoop = bits, U32, 932, [10:10] -badTps = bits, U32, 932, [11:11] -looksLikeRunning = bits, U32, 932, [12:12] -looksLikeCoasting = bits, U32, 932, [13:13] -looksLikeCrankToIdle = bits, U32, 932, [14:14] -useInstantRpmForIdle = bits, U32, 932, [15:15] -isVerboseIAC = bits, U32, 932, [16:16] -targetRpmByClt = scalar, S32, 936, "", 1, 0 -targetRpmAcBump = scalar, S32, 940, "", 1, 0 -; total TS size = 944 -baseDwell = scalar, F32, 944, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 948, "", 1, 0 -luaTimingAdd = scalar, F32, 952, "", 1, 0 -luaTimingMult = scalar, F32, 956, "", 1, 0 +isPrime = bits, U32, 664, [0:0] +engineTurnedRecently = bits, U32, 664, [1:1] +isPumpOn = bits, U32, 664, [2:2] +ignitionOn = bits, U32, 664, [3:3] +; total TS size = 668 +isBenchTest = bits, U32, 668, [0:0] +hasIgnitionVoltage = bits, U32, 668, [1:1] +mainRelayState = bits, U32, 668, [2:2] +delayedShutoffRequested = bits, U32, 668, [3:3] +; total TS size = 672 +lua_fuelAdd = scalar, F32, 672, "", 1, 0 +lua_clutchUpState = bits, U32, 676, [0:0] +lua_brakePedalState = bits, U32, 676, [1:1] +sd_isTChargeAirModel = bits, U32, 680, [0:0] +sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 +sd_tCharge = scalar, F32, 688, "", 1, 0 +sd_tChargeK = scalar, F32, 692, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 +sd_airFlow = scalar, F32, 700, "", 1, 0 +targetAFR = scalar, F32, 704, "", 1, 0 +engineCycleDurationMs = scalar, F32, 708, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 +currentTpsAdc = scalar, S32, 716, "", 1, 0 +tpsVoltageMCU = scalar, F32, 720, "", 1, 0 +tpsVoltageBoard = scalar, F32, 724, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 +injectorFlowCorrection = scalar, F32, 732, "", 1, 0 +baroCorrection = scalar, F32, 736, "", 1, 0 +cranking_baseFuel = scalar, F32, 740, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 +cranking_fuel = scalar, F32, 756, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 +running_injectorLag = scalar, F32, 776, "", 1, 0 +running_baseFuel = scalar, F32, 780, "", 1, 0 +running_fuel = scalar, F32, 784, "", 1, 0 +sparkDwell = scalar, F32, 788, "", 1, 0 +dwellAngle = scalar, F32, 792, "", 1, 0 +cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 802, "id", 1, 0 +clutchUpState = bits, U32, 804, [0:0] +clutchDownState = bits, U32, 804, [1:1] +brakePedalState = bits, U32, 804, [2:2] +; total TS size = 808 +tpsFrom = scalar, F32, 808, "", 1, 0 +tpsTo = scalar, F32, 812, "", 1, 0 +deltaTps = scalar, F32, 816, "", 1, 0 +extraFuel = scalar, F32, 820, "", 1, 0 +valueFromTable = scalar, F32, 824, "", 1, 0 +isAboveAccelThreshold = bits, U32, 828, [0:0] +isBelowDecelThreshold = bits, U32, 828, [1:1] +isTimeToResetAccumulator = bits, U32, 828, [2:2] +isFractionalEnrichment = bits, U32, 828, [3:3] +belowEpsilon = bits, U32, 828, [4:4] +tooShort = bits, U32, 828, [5:5] +fractionalInjFuel = scalar, F32, 832, "", 1, 0 +accumulatedValue = scalar, F32, 836, "", 1, 0 +maxExtraPerCycle = scalar, F32, 840, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 +cycleCnt = scalar, S32, 852, "", 1, 0 +; total TS size = 856 +hwEventCounters1 = scalar, S32, 856, "", 1, 0 +hwEventCounters2 = scalar, S32, 860, "", 1, 0 +hwEventCounters3 = scalar, S32, 864, "", 1, 0 +hwEventCounters4 = scalar, S32, 868, "", 1, 0 +hwEventCounters5 = scalar, S32, 872, "", 1, 0 +hwEventCounters6 = scalar, S32, 876, "", 1, 0 +vvtCamCounter = scalar, S32, 880, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 +mapVvt_map_peak = scalar, U08, 893, "", 1, 0 +; total TS size = 896 +totalRevolutionCounter = scalar, U32, 896, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 +vvtCurrentPosition = scalar, F32, 904, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerStateIndex = scalar, U08, 916, "", 1, 0 +vvtCounter = scalar, U08, 917, "", 1, 0 +vvtSyncCounter = scalar, U08, 918, "", 1, 0 +vvtStateIndex = scalar, U08, 919, "", 1, 0 +; total TS size = 920 +wallFuelCorrection = scalar, F32, 920, "", 1, 0 +wallFuel = scalar, F32, 924, "", 1, 0 +; total TS size = 928 +idleState = scalar, S32, 928, "", 1, 0 +currentIdlePosition = scalar, F32, 932, "", 1, 0 +baseIdlePosition = scalar, F32, 936, "", 1, 0 +iacByTpsTaper = scalar, F32, 940, "", 1, 0 +throttlePedalUpState = scalar, S32, 944, "", 1, 0 +mightResetPid = bits, U32, 948, [0:0] +shouldResetPid = bits, U32, 948, [1:1] +wasResetPid = bits, U32, 948, [2:2] +mustResetPid = bits, U32, 948, [3:3] +isCoasting = bits, U32, 948, [4:4] +useIacTableForCoasting = bits, U32, 948, [5:5] +notIdling = bits, U32, 948, [6:6] +needReset = bits, U32, 948, [7:7] +isInDeadZone = bits, U32, 948, [8:8] +isBlipping = bits, U32, 948, [9:9] +useClosedLoop = bits, U32, 948, [10:10] +badTps = bits, U32, 948, [11:11] +looksLikeRunning = bits, U32, 948, [12:12] +looksLikeCoasting = bits, U32, 948, [13:13] +looksLikeCrankToIdle = bits, U32, 948, [14:14] +useInstantRpmForIdle = bits, U32, 948, [15:15] +isVerboseIAC = bits, U32, 948, [16:16] +targetRpmByClt = scalar, S32, 952, "", 1, 0 +targetRpmAcBump = scalar, S32, 956, "", 1, 0 ; total TS size = 960 -idlePosition = scalar, F32, 960, "", 1, 0 -trim = scalar, F32, 964, "", 1, 0 -luaAdjustment = scalar, F32, 968, "", 1, 0 -etbFeedForward = scalar, F32, 972, "", 1, 0 -etbIntegralError = scalar, F32, 976, "", 1, 0 -etbCurrentTarget = scalar, F32, 980, "%", 1, 0 -; total TS size = 984 -faultCode = scalar, U08, 984, "", 1, 0 -heaterDuty = scalar, U08, 985, "%", 1, 0 -pumpDuty = scalar, U08, 986, "%", 1, 0 -tempC = scalar, U16, 988, "C", 1, 0 -nernstVoltage = scalar, U16, 990, "V", 0.001, 0 -esr = scalar, U16, 992, "", 1, 0 -; total TS size = 996 +baseDwell = scalar, F32, 960, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 +luaTimingAdd = scalar, F32, 968, "", 1, 0 +luaTimingMult = scalar, F32, 972, "", 1, 0 +; total TS size = 976 +idlePosition = scalar, F32, 976, "", 1, 0 +trim = scalar, F32, 980, "", 1, 0 +luaAdjustment = scalar, F32, 984, "", 1, 0 +etbFeedForward = scalar, F32, 988, "", 1, 0 +etbIntegralError = scalar, F32, 992, "", 1, 0 +etbCurrentTarget = scalar, F32, 996, "%", 1, 0 +; total TS size = 1000 +faultCode = scalar, U08, 1000, "", 1, 0 +heaterDuty = scalar, U08, 1001, "%", 1, 0 +pumpDuty = scalar, U08, 1002, "%", 1, 0 +tempC = scalar, U16, 1004, "C", 1, 0 +nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 +esr = scalar, U16, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4105,6 +4110,8 @@ entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" +entry = loadTargetAdd, "loadTargetAdd", float, "%.3f" +entry = loadTargetMult, "loadTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = boostControllerClosedLoopPart, "Boost Closed Loop", float, "%.3f" entry = boostControlTarget, "Boost Target", float, "%.3f" @@ -4133,6 +4140,9 @@ entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" +entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" +entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" entry = sd_airMassInOneCylinder, "Speed-density logic: calculated air mass in one cylinder, in grams", float, "%.3f" entry = sd_tCharge, "speed density", float, "%.3f" @@ -4797,8 +4807,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South + graphLine = loadTargetAdd + graphLine = loadTargetMult graphLine = openLoopPart graphLine = boostControllerClosedLoopPart + liveGraph = boost_control_2_Graph, "Graph", South graphLine = boostControlTarget indicatorPanel = ac_controlIndicatorPanel, 2 @@ -4848,6 +4861,8 @@ dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" + indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" indicator = {sd_isTChargeAirModel}, "isTChargeAirModel No", "isTChargeAirModel Yes" indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" @@ -4856,44 +4871,46 @@ indicatorPanel = engine_stateIndicatorPanel, 2 dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South + graphLine = lua_fuelAdd graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge graphLine = sd_tChargeK - graphLine = sd_Tcharge_coff liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS liveGraph = engine_state_3_Graph, "Graph", South + graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE liveGraph = engine_state_4_Graph, "Graph", South + graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection graphLine = cranking_baseFuel - graphLine = cranking_coolantTemperatureCoefficient liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient graphLine = cranking_fuel - graphLine = running_postCrankingFuelCorrection liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient graphLine = running_timeSinceCrankingInSecs - graphLine = running_injectorLag liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel graphLine = sparkDwell - graphLine = dwellAngle liveGraph = engine_state_8_Graph, "Graph", South + graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection graphLine = timingPidCorrection + liveGraph = engine_state_9_Graph, "Graph", South graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index 43ab184390..ada35a88ec 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Wed Jun 29 22:51:53 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Thu Jun 30 03:37:30 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -423,10 +423,12 @@ public class BoostControl { public static final Field UNUSEDBIT_5_29 = Field.create("UNUSEDBIT_5_29", 0, FieldType.BIT, 29); public static final Field UNUSEDBIT_5_30 = Field.create("UNUSEDBIT_5_30", 0, FieldType.BIT, 30); public static final Field UNUSEDBIT_5_31 = Field.create("UNUSEDBIT_5_31", 0, FieldType.BIT, 31); - public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 4, FieldType.FLOAT); - public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 8, FieldType.INT8).setScale(0.5); - public static final Field ALIGNMENTFILL_AT_9 = Field.create("ALIGNMENTFILL_AT_9", 9, FieldType.INT8).setScale(1.0); - public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 10, FieldType.INT16).setScale(0.03333333333333333); + public static final Field LOADTARGETADD = Field.create("LOADTARGETADD", 4, FieldType.FLOAT); + public static final Field LOADTARGETMULT = Field.create("LOADTARGETMULT", 8, FieldType.FLOAT); + public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT); + public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 16, FieldType.INT8).setScale(0.5); + public static final Field ALIGNMENTFILL_AT_17 = Field.create("ALIGNMENTFILL_AT_17", 17, FieldType.INT8).setScale(1.0); + public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 18, FieldType.INT16).setScale(0.03333333333333333); public static final Field[] VALUES = { ISTPSINVALID, M_SHOULDRESETPID, @@ -460,9 +462,11 @@ public class BoostControl { UNUSEDBIT_5_29, UNUSEDBIT_5_30, UNUSEDBIT_5_31, + LOADTARGETADD, + LOADTARGETMULT, OPENLOOPPART, BOOSTCONTROLLERCLOSEDLOOPPART, - ALIGNMENTFILL_AT_9, + ALIGNMENTFILL_AT_17, BOOSTCONTROLTARGET, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 544952aad9..aab57d6ade 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 22:51:53 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Jun 30 03:37:30 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -391,103 +391,169 @@ public class EngineState { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field SD_ISTCHARGEAIRMODEL = Field.create("SD_ISTCHARGEAIRMODEL", 0, FieldType.BIT, 0); - public static final Field SD_UNUSEDBIT_1_1 = Field.create("SD_UNUSEDBIT_1_1", 0, FieldType.BIT, 1); - public static final Field SD_UNUSEDBIT_1_2 = Field.create("SD_UNUSEDBIT_1_2", 0, FieldType.BIT, 2); - public static final Field SD_UNUSEDBIT_1_3 = Field.create("SD_UNUSEDBIT_1_3", 0, FieldType.BIT, 3); - public static final Field SD_UNUSEDBIT_1_4 = Field.create("SD_UNUSEDBIT_1_4", 0, FieldType.BIT, 4); - public static final Field SD_UNUSEDBIT_1_5 = Field.create("SD_UNUSEDBIT_1_5", 0, FieldType.BIT, 5); - public static final Field SD_UNUSEDBIT_1_6 = Field.create("SD_UNUSEDBIT_1_6", 0, FieldType.BIT, 6); - public static final Field SD_UNUSEDBIT_1_7 = Field.create("SD_UNUSEDBIT_1_7", 0, FieldType.BIT, 7); - public static final Field SD_UNUSEDBIT_1_8 = Field.create("SD_UNUSEDBIT_1_8", 0, FieldType.BIT, 8); - public static final Field SD_UNUSEDBIT_1_9 = Field.create("SD_UNUSEDBIT_1_9", 0, FieldType.BIT, 9); - public static final Field SD_UNUSEDBIT_1_10 = Field.create("SD_UNUSEDBIT_1_10", 0, FieldType.BIT, 10); - public static final Field SD_UNUSEDBIT_1_11 = Field.create("SD_UNUSEDBIT_1_11", 0, FieldType.BIT, 11); - public static final Field SD_UNUSEDBIT_1_12 = Field.create("SD_UNUSEDBIT_1_12", 0, FieldType.BIT, 12); - public static final Field SD_UNUSEDBIT_1_13 = Field.create("SD_UNUSEDBIT_1_13", 0, FieldType.BIT, 13); - public static final Field SD_UNUSEDBIT_1_14 = Field.create("SD_UNUSEDBIT_1_14", 0, FieldType.BIT, 14); - public static final Field SD_UNUSEDBIT_1_15 = Field.create("SD_UNUSEDBIT_1_15", 0, FieldType.BIT, 15); - public static final Field SD_UNUSEDBIT_1_16 = Field.create("SD_UNUSEDBIT_1_16", 0, FieldType.BIT, 16); - public static final Field SD_UNUSEDBIT_1_17 = Field.create("SD_UNUSEDBIT_1_17", 0, FieldType.BIT, 17); - public static final Field SD_UNUSEDBIT_1_18 = Field.create("SD_UNUSEDBIT_1_18", 0, FieldType.BIT, 18); - public static final Field SD_UNUSEDBIT_1_19 = Field.create("SD_UNUSEDBIT_1_19", 0, FieldType.BIT, 19); - public static final Field SD_UNUSEDBIT_1_20 = Field.create("SD_UNUSEDBIT_1_20", 0, FieldType.BIT, 20); - public static final Field SD_UNUSEDBIT_1_21 = Field.create("SD_UNUSEDBIT_1_21", 0, FieldType.BIT, 21); - public static final Field SD_UNUSEDBIT_1_22 = Field.create("SD_UNUSEDBIT_1_22", 0, FieldType.BIT, 22); - public static final Field SD_UNUSEDBIT_1_23 = Field.create("SD_UNUSEDBIT_1_23", 0, FieldType.BIT, 23); - public static final Field SD_UNUSEDBIT_1_24 = Field.create("SD_UNUSEDBIT_1_24", 0, FieldType.BIT, 24); - public static final Field SD_UNUSEDBIT_1_25 = Field.create("SD_UNUSEDBIT_1_25", 0, FieldType.BIT, 25); - public static final Field SD_UNUSEDBIT_1_26 = Field.create("SD_UNUSEDBIT_1_26", 0, FieldType.BIT, 26); - public static final Field SD_UNUSEDBIT_1_27 = Field.create("SD_UNUSEDBIT_1_27", 0, FieldType.BIT, 27); - public static final Field SD_UNUSEDBIT_1_28 = Field.create("SD_UNUSEDBIT_1_28", 0, FieldType.BIT, 28); - public static final Field SD_UNUSEDBIT_1_29 = Field.create("SD_UNUSEDBIT_1_29", 0, FieldType.BIT, 29); - public static final Field SD_UNUSEDBIT_1_30 = Field.create("SD_UNUSEDBIT_1_30", 0, FieldType.BIT, 30); - public static final Field SD_UNUSEDBIT_1_31 = Field.create("SD_UNUSEDBIT_1_31", 0, FieldType.BIT, 31); - public static final Field SD_AIRMASSINONECYLINDER = Field.create("SD_AIRMASSINONECYLINDER", 4, FieldType.FLOAT); - public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 8, FieldType.FLOAT); - public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 12, FieldType.FLOAT); - public static final Field SD_TCHARGE_COFF = Field.create("SD_TCHARGE_COFF", 16, FieldType.FLOAT); - public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT); - public static final Field TARGETAFR = Field.create("TARGETAFR", 24, FieldType.FLOAT); - public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 28, FieldType.FLOAT); - public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 32, FieldType.FLOAT); - public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 36, FieldType.INT).setScale(1.0); - public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 40, FieldType.FLOAT); - public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 44, FieldType.FLOAT); - public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 48, FieldType.FLOAT); - public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 52, FieldType.FLOAT); - public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 56, FieldType.FLOAT); - public static final Field CRANKING_BASEFUEL = Field.create("CRANKING_BASEFUEL", 60, FieldType.FLOAT); - public static final Field CRANKING_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKING_COOLANTTEMPERATURECOEFFICIENT", 64, FieldType.FLOAT); - public static final Field CRANKING_TPSCOEFFICIENT = Field.create("CRANKING_TPSCOEFFICIENT", 68, FieldType.FLOAT); - public static final Field CRANKING_DURATIONCOEFFICIENT = Field.create("CRANKING_DURATIONCOEFFICIENT", 72, FieldType.FLOAT); - public static final Field CRANKING_FUEL = Field.create("CRANKING_FUEL", 76, FieldType.FLOAT); - public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 80, FieldType.FLOAT); - public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 84, FieldType.FLOAT); - public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 88, FieldType.FLOAT); - public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 92, FieldType.FLOAT); - public static final Field RUNNING_INJECTORLAG = Field.create("RUNNING_INJECTORLAG", 96, FieldType.FLOAT); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 100, FieldType.FLOAT); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 104, FieldType.FLOAT); - public static final Field SPARKDWELL = Field.create("SPARKDWELL", 108, FieldType.FLOAT); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 112, FieldType.FLOAT); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 116, FieldType.INT16).setScale(0.01); - public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 118, FieldType.INT16).setScale(0.01); - public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 120, FieldType.INT16).setScale(0.01); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 122, FieldType.INT16).setScale(1.0); - public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 124, FieldType.BIT, 0); - public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 124, FieldType.BIT, 1); - public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 124, FieldType.BIT, 2); - public static final Field UNUSEDBIT_21_3 = Field.create("UNUSEDBIT_21_3", 124, FieldType.BIT, 3); - public static final Field UNUSEDBIT_21_4 = Field.create("UNUSEDBIT_21_4", 124, FieldType.BIT, 4); - public static final Field UNUSEDBIT_21_5 = Field.create("UNUSEDBIT_21_5", 124, FieldType.BIT, 5); - public static final Field UNUSEDBIT_21_6 = Field.create("UNUSEDBIT_21_6", 124, FieldType.BIT, 6); - public static final Field UNUSEDBIT_21_7 = Field.create("UNUSEDBIT_21_7", 124, FieldType.BIT, 7); - public static final Field UNUSEDBIT_21_8 = Field.create("UNUSEDBIT_21_8", 124, FieldType.BIT, 8); - public static final Field UNUSEDBIT_21_9 = Field.create("UNUSEDBIT_21_9", 124, FieldType.BIT, 9); - public static final Field UNUSEDBIT_21_10 = Field.create("UNUSEDBIT_21_10", 124, FieldType.BIT, 10); - public static final Field UNUSEDBIT_21_11 = Field.create("UNUSEDBIT_21_11", 124, FieldType.BIT, 11); - public static final Field UNUSEDBIT_21_12 = Field.create("UNUSEDBIT_21_12", 124, FieldType.BIT, 12); - public static final Field UNUSEDBIT_21_13 = Field.create("UNUSEDBIT_21_13", 124, FieldType.BIT, 13); - public static final Field UNUSEDBIT_21_14 = Field.create("UNUSEDBIT_21_14", 124, FieldType.BIT, 14); - public static final Field UNUSEDBIT_21_15 = Field.create("UNUSEDBIT_21_15", 124, FieldType.BIT, 15); - public static final Field UNUSEDBIT_21_16 = Field.create("UNUSEDBIT_21_16", 124, FieldType.BIT, 16); - public static final Field UNUSEDBIT_21_17 = Field.create("UNUSEDBIT_21_17", 124, FieldType.BIT, 17); - public static final Field UNUSEDBIT_21_18 = Field.create("UNUSEDBIT_21_18", 124, FieldType.BIT, 18); - public static final Field UNUSEDBIT_21_19 = Field.create("UNUSEDBIT_21_19", 124, FieldType.BIT, 19); - public static final Field UNUSEDBIT_21_20 = Field.create("UNUSEDBIT_21_20", 124, FieldType.BIT, 20); - public static final Field UNUSEDBIT_21_21 = Field.create("UNUSEDBIT_21_21", 124, FieldType.BIT, 21); - public static final Field UNUSEDBIT_21_22 = Field.create("UNUSEDBIT_21_22", 124, FieldType.BIT, 22); - public static final Field UNUSEDBIT_21_23 = Field.create("UNUSEDBIT_21_23", 124, FieldType.BIT, 23); - public static final Field UNUSEDBIT_21_24 = Field.create("UNUSEDBIT_21_24", 124, FieldType.BIT, 24); - public static final Field UNUSEDBIT_21_25 = Field.create("UNUSEDBIT_21_25", 124, FieldType.BIT, 25); - public static final Field UNUSEDBIT_21_26 = Field.create("UNUSEDBIT_21_26", 124, FieldType.BIT, 26); - public static final Field UNUSEDBIT_21_27 = Field.create("UNUSEDBIT_21_27", 124, FieldType.BIT, 27); - public static final Field UNUSEDBIT_21_28 = Field.create("UNUSEDBIT_21_28", 124, FieldType.BIT, 28); - public static final Field UNUSEDBIT_21_29 = Field.create("UNUSEDBIT_21_29", 124, FieldType.BIT, 29); - public static final Field UNUSEDBIT_21_30 = Field.create("UNUSEDBIT_21_30", 124, FieldType.BIT, 30); - public static final Field UNUSEDBIT_21_31 = Field.create("UNUSEDBIT_21_31", 124, FieldType.BIT, 31); + public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT); + public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 4, FieldType.BIT, 0); + public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 4, FieldType.BIT, 1); + public static final Field LUA_UNUSEDBIT_3_2 = Field.create("LUA_UNUSEDBIT_3_2", 4, FieldType.BIT, 2); + public static final Field LUA_UNUSEDBIT_3_3 = Field.create("LUA_UNUSEDBIT_3_3", 4, FieldType.BIT, 3); + public static final Field LUA_UNUSEDBIT_3_4 = Field.create("LUA_UNUSEDBIT_3_4", 4, FieldType.BIT, 4); + public static final Field LUA_UNUSEDBIT_3_5 = Field.create("LUA_UNUSEDBIT_3_5", 4, FieldType.BIT, 5); + public static final Field LUA_UNUSEDBIT_3_6 = Field.create("LUA_UNUSEDBIT_3_6", 4, FieldType.BIT, 6); + public static final Field LUA_UNUSEDBIT_3_7 = Field.create("LUA_UNUSEDBIT_3_7", 4, FieldType.BIT, 7); + public static final Field LUA_UNUSEDBIT_3_8 = Field.create("LUA_UNUSEDBIT_3_8", 4, FieldType.BIT, 8); + public static final Field LUA_UNUSEDBIT_3_9 = Field.create("LUA_UNUSEDBIT_3_9", 4, FieldType.BIT, 9); + public static final Field LUA_UNUSEDBIT_3_10 = Field.create("LUA_UNUSEDBIT_3_10", 4, FieldType.BIT, 10); + public static final Field LUA_UNUSEDBIT_3_11 = Field.create("LUA_UNUSEDBIT_3_11", 4, FieldType.BIT, 11); + public static final Field LUA_UNUSEDBIT_3_12 = Field.create("LUA_UNUSEDBIT_3_12", 4, FieldType.BIT, 12); + public static final Field LUA_UNUSEDBIT_3_13 = Field.create("LUA_UNUSEDBIT_3_13", 4, FieldType.BIT, 13); + public static final Field LUA_UNUSEDBIT_3_14 = Field.create("LUA_UNUSEDBIT_3_14", 4, FieldType.BIT, 14); + public static final Field LUA_UNUSEDBIT_3_15 = Field.create("LUA_UNUSEDBIT_3_15", 4, FieldType.BIT, 15); + public static final Field LUA_UNUSEDBIT_3_16 = Field.create("LUA_UNUSEDBIT_3_16", 4, FieldType.BIT, 16); + public static final Field LUA_UNUSEDBIT_3_17 = Field.create("LUA_UNUSEDBIT_3_17", 4, FieldType.BIT, 17); + public static final Field LUA_UNUSEDBIT_3_18 = Field.create("LUA_UNUSEDBIT_3_18", 4, FieldType.BIT, 18); + public static final Field LUA_UNUSEDBIT_3_19 = Field.create("LUA_UNUSEDBIT_3_19", 4, FieldType.BIT, 19); + public static final Field LUA_UNUSEDBIT_3_20 = Field.create("LUA_UNUSEDBIT_3_20", 4, FieldType.BIT, 20); + public static final Field LUA_UNUSEDBIT_3_21 = Field.create("LUA_UNUSEDBIT_3_21", 4, FieldType.BIT, 21); + public static final Field LUA_UNUSEDBIT_3_22 = Field.create("LUA_UNUSEDBIT_3_22", 4, FieldType.BIT, 22); + public static final Field LUA_UNUSEDBIT_3_23 = Field.create("LUA_UNUSEDBIT_3_23", 4, FieldType.BIT, 23); + public static final Field LUA_UNUSEDBIT_3_24 = Field.create("LUA_UNUSEDBIT_3_24", 4, FieldType.BIT, 24); + public static final Field LUA_UNUSEDBIT_3_25 = Field.create("LUA_UNUSEDBIT_3_25", 4, FieldType.BIT, 25); + public static final Field LUA_UNUSEDBIT_3_26 = Field.create("LUA_UNUSEDBIT_3_26", 4, FieldType.BIT, 26); + public static final Field LUA_UNUSEDBIT_3_27 = Field.create("LUA_UNUSEDBIT_3_27", 4, FieldType.BIT, 27); + public static final Field LUA_UNUSEDBIT_3_28 = Field.create("LUA_UNUSEDBIT_3_28", 4, FieldType.BIT, 28); + public static final Field LUA_UNUSEDBIT_3_29 = Field.create("LUA_UNUSEDBIT_3_29", 4, FieldType.BIT, 29); + public static final Field LUA_UNUSEDBIT_3_30 = Field.create("LUA_UNUSEDBIT_3_30", 4, FieldType.BIT, 30); + public static final Field LUA_UNUSEDBIT_3_31 = Field.create("LUA_UNUSEDBIT_3_31", 4, FieldType.BIT, 31); + public static final Field SD_ISTCHARGEAIRMODEL = Field.create("SD_ISTCHARGEAIRMODEL", 8, FieldType.BIT, 0); + public static final Field SD_UNUSEDBIT_1_1 = Field.create("SD_UNUSEDBIT_1_1", 8, FieldType.BIT, 1); + public static final Field SD_UNUSEDBIT_1_2 = Field.create("SD_UNUSEDBIT_1_2", 8, FieldType.BIT, 2); + public static final Field SD_UNUSEDBIT_1_3 = Field.create("SD_UNUSEDBIT_1_3", 8, FieldType.BIT, 3); + public static final Field SD_UNUSEDBIT_1_4 = Field.create("SD_UNUSEDBIT_1_4", 8, FieldType.BIT, 4); + public static final Field SD_UNUSEDBIT_1_5 = Field.create("SD_UNUSEDBIT_1_5", 8, FieldType.BIT, 5); + public static final Field SD_UNUSEDBIT_1_6 = Field.create("SD_UNUSEDBIT_1_6", 8, FieldType.BIT, 6); + public static final Field SD_UNUSEDBIT_1_7 = Field.create("SD_UNUSEDBIT_1_7", 8, FieldType.BIT, 7); + public static final Field SD_UNUSEDBIT_1_8 = Field.create("SD_UNUSEDBIT_1_8", 8, FieldType.BIT, 8); + public static final Field SD_UNUSEDBIT_1_9 = Field.create("SD_UNUSEDBIT_1_9", 8, FieldType.BIT, 9); + public static final Field SD_UNUSEDBIT_1_10 = Field.create("SD_UNUSEDBIT_1_10", 8, FieldType.BIT, 10); + public static final Field SD_UNUSEDBIT_1_11 = Field.create("SD_UNUSEDBIT_1_11", 8, FieldType.BIT, 11); + public static final Field SD_UNUSEDBIT_1_12 = Field.create("SD_UNUSEDBIT_1_12", 8, FieldType.BIT, 12); + public static final Field SD_UNUSEDBIT_1_13 = Field.create("SD_UNUSEDBIT_1_13", 8, FieldType.BIT, 13); + public static final Field SD_UNUSEDBIT_1_14 = Field.create("SD_UNUSEDBIT_1_14", 8, FieldType.BIT, 14); + public static final Field SD_UNUSEDBIT_1_15 = Field.create("SD_UNUSEDBIT_1_15", 8, FieldType.BIT, 15); + public static final Field SD_UNUSEDBIT_1_16 = Field.create("SD_UNUSEDBIT_1_16", 8, FieldType.BIT, 16); + public static final Field SD_UNUSEDBIT_1_17 = Field.create("SD_UNUSEDBIT_1_17", 8, FieldType.BIT, 17); + public static final Field SD_UNUSEDBIT_1_18 = Field.create("SD_UNUSEDBIT_1_18", 8, FieldType.BIT, 18); + public static final Field SD_UNUSEDBIT_1_19 = Field.create("SD_UNUSEDBIT_1_19", 8, FieldType.BIT, 19); + public static final Field SD_UNUSEDBIT_1_20 = Field.create("SD_UNUSEDBIT_1_20", 8, FieldType.BIT, 20); + public static final Field SD_UNUSEDBIT_1_21 = Field.create("SD_UNUSEDBIT_1_21", 8, FieldType.BIT, 21); + public static final Field SD_UNUSEDBIT_1_22 = Field.create("SD_UNUSEDBIT_1_22", 8, FieldType.BIT, 22); + public static final Field SD_UNUSEDBIT_1_23 = Field.create("SD_UNUSEDBIT_1_23", 8, FieldType.BIT, 23); + public static final Field SD_UNUSEDBIT_1_24 = Field.create("SD_UNUSEDBIT_1_24", 8, FieldType.BIT, 24); + public static final Field SD_UNUSEDBIT_1_25 = Field.create("SD_UNUSEDBIT_1_25", 8, FieldType.BIT, 25); + public static final Field SD_UNUSEDBIT_1_26 = Field.create("SD_UNUSEDBIT_1_26", 8, FieldType.BIT, 26); + public static final Field SD_UNUSEDBIT_1_27 = Field.create("SD_UNUSEDBIT_1_27", 8, FieldType.BIT, 27); + public static final Field SD_UNUSEDBIT_1_28 = Field.create("SD_UNUSEDBIT_1_28", 8, FieldType.BIT, 28); + public static final Field SD_UNUSEDBIT_1_29 = Field.create("SD_UNUSEDBIT_1_29", 8, FieldType.BIT, 29); + public static final Field SD_UNUSEDBIT_1_30 = Field.create("SD_UNUSEDBIT_1_30", 8, FieldType.BIT, 30); + public static final Field SD_UNUSEDBIT_1_31 = Field.create("SD_UNUSEDBIT_1_31", 8, FieldType.BIT, 31); + public static final Field SD_AIRMASSINONECYLINDER = Field.create("SD_AIRMASSINONECYLINDER", 12, FieldType.FLOAT); + public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 16, FieldType.FLOAT); + public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 20, FieldType.FLOAT); + public static final Field SD_TCHARGE_COFF = Field.create("SD_TCHARGE_COFF", 24, FieldType.FLOAT); + public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 28, FieldType.FLOAT); + public static final Field TARGETAFR = Field.create("TARGETAFR", 32, FieldType.FLOAT); + public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 36, FieldType.FLOAT); + public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 40, FieldType.FLOAT); + public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 44, FieldType.INT).setScale(1.0); + public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 48, FieldType.FLOAT); + public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 52, FieldType.FLOAT); + public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 56, FieldType.FLOAT); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 60, FieldType.FLOAT); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 64, FieldType.FLOAT); + public static final Field CRANKING_BASEFUEL = Field.create("CRANKING_BASEFUEL", 68, FieldType.FLOAT); + public static final Field CRANKING_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKING_COOLANTTEMPERATURECOEFFICIENT", 72, FieldType.FLOAT); + public static final Field CRANKING_TPSCOEFFICIENT = Field.create("CRANKING_TPSCOEFFICIENT", 76, FieldType.FLOAT); + public static final Field CRANKING_DURATIONCOEFFICIENT = Field.create("CRANKING_DURATIONCOEFFICIENT", 80, FieldType.FLOAT); + public static final Field CRANKING_FUEL = Field.create("CRANKING_FUEL", 84, FieldType.FLOAT); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 88, FieldType.FLOAT); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 92, FieldType.FLOAT); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 96, FieldType.FLOAT); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 100, FieldType.FLOAT); + public static final Field RUNNING_INJECTORLAG = Field.create("RUNNING_INJECTORLAG", 104, FieldType.FLOAT); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 108, FieldType.FLOAT); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 112, FieldType.FLOAT); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 116, FieldType.FLOAT); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 120, FieldType.FLOAT); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 124, FieldType.INT16).setScale(0.01); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 126, FieldType.INT16).setScale(0.01); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 128, FieldType.INT16).setScale(0.01); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 130, FieldType.INT16).setScale(1.0); + public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 132, FieldType.BIT, 0); + public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 132, FieldType.BIT, 1); + public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 132, FieldType.BIT, 2); + public static final Field UNUSEDBIT_22_3 = Field.create("UNUSEDBIT_22_3", 132, FieldType.BIT, 3); + public static final Field UNUSEDBIT_22_4 = Field.create("UNUSEDBIT_22_4", 132, FieldType.BIT, 4); + public static final Field UNUSEDBIT_22_5 = Field.create("UNUSEDBIT_22_5", 132, FieldType.BIT, 5); + public static final Field UNUSEDBIT_22_6 = Field.create("UNUSEDBIT_22_6", 132, FieldType.BIT, 6); + public static final Field UNUSEDBIT_22_7 = Field.create("UNUSEDBIT_22_7", 132, FieldType.BIT, 7); + public static final Field UNUSEDBIT_22_8 = Field.create("UNUSEDBIT_22_8", 132, FieldType.BIT, 8); + public static final Field UNUSEDBIT_22_9 = Field.create("UNUSEDBIT_22_9", 132, FieldType.BIT, 9); + public static final Field UNUSEDBIT_22_10 = Field.create("UNUSEDBIT_22_10", 132, FieldType.BIT, 10); + public static final Field UNUSEDBIT_22_11 = Field.create("UNUSEDBIT_22_11", 132, FieldType.BIT, 11); + public static final Field UNUSEDBIT_22_12 = Field.create("UNUSEDBIT_22_12", 132, FieldType.BIT, 12); + public static final Field UNUSEDBIT_22_13 = Field.create("UNUSEDBIT_22_13", 132, FieldType.BIT, 13); + public static final Field UNUSEDBIT_22_14 = Field.create("UNUSEDBIT_22_14", 132, FieldType.BIT, 14); + public static final Field UNUSEDBIT_22_15 = Field.create("UNUSEDBIT_22_15", 132, FieldType.BIT, 15); + public static final Field UNUSEDBIT_22_16 = Field.create("UNUSEDBIT_22_16", 132, FieldType.BIT, 16); + public static final Field UNUSEDBIT_22_17 = Field.create("UNUSEDBIT_22_17", 132, FieldType.BIT, 17); + public static final Field UNUSEDBIT_22_18 = Field.create("UNUSEDBIT_22_18", 132, FieldType.BIT, 18); + public static final Field UNUSEDBIT_22_19 = Field.create("UNUSEDBIT_22_19", 132, FieldType.BIT, 19); + public static final Field UNUSEDBIT_22_20 = Field.create("UNUSEDBIT_22_20", 132, FieldType.BIT, 20); + public static final Field UNUSEDBIT_22_21 = Field.create("UNUSEDBIT_22_21", 132, FieldType.BIT, 21); + public static final Field UNUSEDBIT_22_22 = Field.create("UNUSEDBIT_22_22", 132, FieldType.BIT, 22); + public static final Field UNUSEDBIT_22_23 = Field.create("UNUSEDBIT_22_23", 132, FieldType.BIT, 23); + public static final Field UNUSEDBIT_22_24 = Field.create("UNUSEDBIT_22_24", 132, FieldType.BIT, 24); + public static final Field UNUSEDBIT_22_25 = Field.create("UNUSEDBIT_22_25", 132, FieldType.BIT, 25); + public static final Field UNUSEDBIT_22_26 = Field.create("UNUSEDBIT_22_26", 132, FieldType.BIT, 26); + public static final Field UNUSEDBIT_22_27 = Field.create("UNUSEDBIT_22_27", 132, FieldType.BIT, 27); + public static final Field UNUSEDBIT_22_28 = Field.create("UNUSEDBIT_22_28", 132, FieldType.BIT, 28); + public static final Field UNUSEDBIT_22_29 = Field.create("UNUSEDBIT_22_29", 132, FieldType.BIT, 29); + public static final Field UNUSEDBIT_22_30 = Field.create("UNUSEDBIT_22_30", 132, FieldType.BIT, 30); + public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 132, FieldType.BIT, 31); public static final Field[] VALUES = { + LUA_FUELADD, + LUA_CLUTCHUPSTATE, + LUA_BRAKEPEDALSTATE, + LUA_UNUSEDBIT_3_2, + LUA_UNUSEDBIT_3_3, + LUA_UNUSEDBIT_3_4, + LUA_UNUSEDBIT_3_5, + LUA_UNUSEDBIT_3_6, + LUA_UNUSEDBIT_3_7, + LUA_UNUSEDBIT_3_8, + LUA_UNUSEDBIT_3_9, + LUA_UNUSEDBIT_3_10, + LUA_UNUSEDBIT_3_11, + LUA_UNUSEDBIT_3_12, + LUA_UNUSEDBIT_3_13, + LUA_UNUSEDBIT_3_14, + LUA_UNUSEDBIT_3_15, + LUA_UNUSEDBIT_3_16, + LUA_UNUSEDBIT_3_17, + LUA_UNUSEDBIT_3_18, + LUA_UNUSEDBIT_3_19, + LUA_UNUSEDBIT_3_20, + LUA_UNUSEDBIT_3_21, + LUA_UNUSEDBIT_3_22, + LUA_UNUSEDBIT_3_23, + LUA_UNUSEDBIT_3_24, + LUA_UNUSEDBIT_3_25, + LUA_UNUSEDBIT_3_26, + LUA_UNUSEDBIT_3_27, + LUA_UNUSEDBIT_3_28, + LUA_UNUSEDBIT_3_29, + LUA_UNUSEDBIT_3_30, + LUA_UNUSEDBIT_3_31, SD_ISTCHARGEAIRMODEL, SD_UNUSEDBIT_1_1, SD_UNUSEDBIT_1_2, @@ -555,34 +621,34 @@ public class EngineState { CLUTCHUPSTATE, CLUTCHDOWNSTATE, BRAKEPEDALSTATE, - UNUSEDBIT_21_3, - UNUSEDBIT_21_4, - UNUSEDBIT_21_5, - UNUSEDBIT_21_6, - UNUSEDBIT_21_7, - UNUSEDBIT_21_8, - UNUSEDBIT_21_9, - UNUSEDBIT_21_10, - UNUSEDBIT_21_11, - UNUSEDBIT_21_12, - UNUSEDBIT_21_13, - UNUSEDBIT_21_14, - UNUSEDBIT_21_15, - UNUSEDBIT_21_16, - UNUSEDBIT_21_17, - UNUSEDBIT_21_18, - UNUSEDBIT_21_19, - UNUSEDBIT_21_20, - UNUSEDBIT_21_21, - UNUSEDBIT_21_22, - UNUSEDBIT_21_23, - UNUSEDBIT_21_24, - UNUSEDBIT_21_25, - UNUSEDBIT_21_26, - UNUSEDBIT_21_27, - UNUSEDBIT_21_28, - UNUSEDBIT_21_29, - UNUSEDBIT_21_30, - UNUSEDBIT_21_31, + UNUSEDBIT_22_3, + UNUSEDBIT_22_4, + UNUSEDBIT_22_5, + UNUSEDBIT_22_6, + UNUSEDBIT_22_7, + UNUSEDBIT_22_8, + UNUSEDBIT_22_9, + UNUSEDBIT_22_10, + UNUSEDBIT_22_11, + UNUSEDBIT_22_12, + UNUSEDBIT_22_13, + UNUSEDBIT_22_14, + UNUSEDBIT_22_15, + UNUSEDBIT_22_16, + UNUSEDBIT_22_17, + UNUSEDBIT_22_18, + UNUSEDBIT_22_19, + UNUSEDBIT_22_20, + UNUSEDBIT_22_21, + UNUSEDBIT_22_22, + UNUSEDBIT_22_23, + UNUSEDBIT_22_24, + UNUSEDBIT_22_25, + UNUSEDBIT_22_26, + UNUSEDBIT_22_27, + UNUSEDBIT_22_28, + UNUSEDBIT_22_29, + UNUSEDBIT_22_30, + UNUSEDBIT_22_31, }; } 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 d5dadab4d6..41e5c25e1d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 02:27:15 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:24 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -2371,10 +2371,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 2022.06.30.all.4022069832"; + public static final String TS_SIGNATURE = "rusEFI 2022.06.30.all.3625456876"; 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 = 996; + public static final int TS_TOTAL_OUTPUT_SIZE = 1012; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3;