From a649063e058b32723cab7af58d59eb32a9cc8d41 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Sat, 14 Jan 2023 21:08:25 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 12 +- .../binary/generated/fancy_content.ini | 25 +- .../console/binary/generated/live_data_ids.h | 16 +- .../binary/generated/output_channels.ini | 202 +++++++-------- .../console/binary/generated/sensors.java | 66 ++--- .../console/binary_log/log_fields_generated.h | 12 +- .../controllers/algo/engine_state_generated.h | 204 ++++++--------- .../algo/fuel/fuel_computer_generated.h | 184 +++++++------ .../lua/generated/output_lookup_generated.cpp | 24 +- firmware/tunerstudio/generated/rusefi.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_48way.ini | 241 +++++++++--------- .../generated/rusefi_alphax-2chan.ini | 241 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 241 +++++++++--------- .../generated/rusefi_alphax-8chan.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_cypress.ini | 241 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 241 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 241 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 241 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 241 +++++++++--------- .../generated/rusefi_hellen-nb1.ini | 241 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 241 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 241 +++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 241 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 241 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 241 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 241 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 241 +++++++++--------- firmware/tunerstudio/generated/rusefi_kin.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_m74_9.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 241 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 241 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 241 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 241 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 241 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_s105.ini | 241 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 241 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 241 +++++++++--------- .../rusefi/config/generated/AcControl.java | 24 +- .../config/generated/AntilagSystem.java | 26 +- .../rusefi/config/generated/BoostControl.java | 26 +- .../rusefi/config/generated/EngineState.java | 106 ++++---- .../rusefi/config/generated/FanControl.java | 16 +- .../rusefi/config/generated/FuelComputer.java | 28 +- .../com/rusefi/config/generated/FuelPump.java | 10 +- .../config/generated/LaunchControl.java | 24 +- .../rusefi/config/generated/MainRelay.java | 10 +- 53 files changed, 4743 insertions(+), 4707 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index d4bbb58ec7..0237c71520 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -314,6 +314,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -403,12 +409,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 21b464b53c..56791da804 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -35,12 +35,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -178,31 +186,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 783e7c6d2d..1f597182e0 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -30,14 +30,14 @@ LDS_wideband_state, #define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 764 #define INJECTOR_MODEL_BASE_ADDRESS 788 #define FUEL_COMPUTER_BASE_ADDRESS 800 -#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 824 -#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 832 -#define BOOST_CONTROL_BASE_ADDRESS 844 -#define AC_CONTROL_BASE_ADDRESS 868 -#define FAN_CONTROL_BASE_ADDRESS 880 -#define FUEL_PUMP_CONTROL_BASE_ADDRESS 884 -#define MAIN_RELAY_BASE_ADDRESS 888 -#define ENGINE_STATE_BASE_ADDRESS 892 +#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 848 +#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 856 +#define BOOST_CONTROL_BASE_ADDRESS 868 +#define AC_CONTROL_BASE_ADDRESS 892 +#define FAN_CONTROL_BASE_ADDRESS 904 +#define FUEL_PUMP_CONTROL_BASE_ADDRESS 908 +#define MAIN_RELAY_BASE_ADDRESS 912 +#define ENGINE_STATE_BASE_ADDRESS 916 #define TPS_ACCEL_STATE_BASE_ADDRESS 1048 #define TRIGGER_CENTRAL_BASE_ADDRESS 1096 #define TRIGGER_STATE_BASE_ADDRESS 1148 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 6be41abd43..f6986f2796 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -481,109 +481,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 5edeeed3fd..70ad1503e1 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -382,37 +382,37 @@ m_deadtime("injectorLag(VBatt)\nthis value depends on a slow-changing VBatt valu pressureDelta("fuel: injector pressureDelta", SensorCategory.SENSOR_INPUTS, FieldType.INT, 792, 1.0, -10000.0, 10000.0, "kPa"), pressureRatio("fuel: injector pressureRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 796, 1.0, -10000.0, 10000.0, ""), totalFuelCorrection("totalFuelCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 800, 1.0, -1.0, -1.0, ""), -afrTableYAxis("afrTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 804, 0.01, 0.0, 0.0, "%"), -targetLambda("fuel: target lambda", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 806, 1.0E-4, 0.0, 0.0, ""), -targetAFR("fuel: target AFR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 808, 0.001, 0.0, 0.0, "ratio"), -stoichiometricRatio("fuel: stoich ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 810, 0.001, 0.0, 0.0, "ratio"), -sdTcharge_coff("sdTcharge_coff", SensorCategory.SENSOR_INPUTS, FieldType.INT, 812, 1.0, -1.0, -1.0, ""), -sdAirMassInOneCylinder("SD cylinder mass\nSpeed-density logic: calculated air mass in one cylinder, in grams", SensorCategory.SENSOR_INPUTS, FieldType.INT, 816, 1.0, -1.0, -1.0, ""), -retardThresholdRpm("retardThresholdRpm", SensorCategory.SENSOR_INPUTS, FieldType.INT, 824, 1.0, -1.0, -1.0, ""), -fuelALSCorrection("fuelALSCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), -timingALSCorrection("timingALSCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 840, 0.01, -20.0, 20.0, "deg"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 842, 1.0, -20.0, 100.0, "units"), -luaTargetAdd("luaTargetAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), -luaTargetMult("luaTargetMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 852, 1.0, -1.0, -1.0, ""), -openLoopPart("openLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 856, 1.0, -1.0, -1.0, ""), -luaOpenLoopAdd("luaOpenLoopAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), -boostControllerClosedLoopPart("Boost Closed Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 864, 0.5, -50.0, 50.0, "%"), -alignmentFill_at_21("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 865, 1.0, -20.0, 100.0, "units"), -boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 866, 0.03333333333333333, 0.0, 0.0, "kPa"), -latest_usage_ac_control("AC latest activity", SensorCategory.SENSOR_INPUTS, FieldType.INT, 872, 1.0, -1.0, -1.0, ""), -acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 876, 1.0, -1.0, -1.0, ""), -lua("lua", SensorCategory.SENSOR_INPUTS, FieldType.INT, 892, 1.0, -1.0, -1.0, ""), -sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -1.0, -1.0, ""), -engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -1.0, -1.0, ""), -minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 920, 1.0, -1.0, -1.0, ""), -currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), -tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), -tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -1.0, -1.0, ""), -currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), -injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), -baroCorrection("fuel: Barometric pressure mult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), -crankingFuel("crankingFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), -running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), +running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 804, 1.0, -1.0, -1.0, ""), +afrTableYAxis("afrTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 828, 0.01, 0.0, 0.0, "%"), +targetLambda("fuel: target lambda", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 830, 1.0E-4, 0.0, 0.0, ""), +targetAFR("fuel: target AFR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 832, 0.001, 0.0, 0.0, "ratio"), +stoichiometricRatio("fuel: stoich ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 834, 0.001, 0.0, 0.0, "ratio"), +sdTcharge_coff("sdTcharge_coff", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), +sdAirMassInOneCylinder("SD cylinder mass\nSpeed-density logic: calculated air mass in one cylinder, in grams", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), +retardThresholdRpm("retardThresholdRpm", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), +fuelALSCorrection("fuelALSCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), +timingALSCorrection("timingALSCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 864, 0.01, -20.0, 20.0, "deg"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 866, 1.0, -20.0, 100.0, "units"), +luaTargetAdd("luaTargetAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 872, 1.0, -1.0, -1.0, ""), +luaTargetMult("luaTargetMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 876, 1.0, -1.0, -1.0, ""), +openLoopPart("openLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 880, 1.0, -1.0, -1.0, ""), +luaOpenLoopAdd("luaOpenLoopAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 884, 1.0, -1.0, -1.0, ""), +boostControllerClosedLoopPart("Boost Closed Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 888, 0.5, -50.0, 50.0, "%"), +alignmentFill_at_21("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 889, 1.0, -20.0, 100.0, "units"), +boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 890, 0.03333333333333333, 0.0, 0.0, "kPa"), +latest_usage_ac_control("AC latest activity", SensorCategory.SENSOR_INPUTS, FieldType.INT, 896, 1.0, -1.0, -1.0, ""), +acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 900, 1.0, -1.0, -1.0, ""), +lua("lua", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -1.0, -1.0, ""), +sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), +engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), +minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), +currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), +tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 952, 1.0, -1.0, -1.0, ""), +tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), +currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), +injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), +baroCorrection("fuel: Barometric pressure mult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), +crankingFuel("crankingFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, -1.0, -1.0, ""), sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -1.0, -1.0, ""), dwellAngle("ignition dwell duration\nas crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1000, 0.01, -20.0, 20.0, "deg"), @@ -423,13 +423,13 @@ startStopStateToggleCounter("startStopStateToggleCounter", SensorCategory.SENSOR egtValue1("egtValue1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, -1.0, -1.0, ""), egtValue2("egtValue2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, -1.0, -1.0, ""), desiredRpmLimit("User-defined RPM hard limit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1024, 1.0, 0.0, 30000.0, "rpm"), -alignmentFill_at_134("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1026, 1.0, -20.0, 100.0, "units"), +alignmentFill_at_110("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1026, 1.0, -20.0, 100.0, "units"), fuelInjectionCounter("fuelInjectionCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1028, 1.0, -1.0, -1.0, ""), sparkCounter("sparkCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1032, 1.0, -1.0, -1.0, ""), fuelingLoad("fuel: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1036, 1.0, -1.0, -1.0, ""), ignitionLoad("ign: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, -1.0, -1.0, ""), veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1044, 0.01, 0.0, 0.0, "%"), -alignmentFill_at_154("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1046, 1.0, -20.0, 100.0, "units"), +alignmentFill_at_130("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1046, 1.0, -20.0, 100.0, "units"), tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, -1.0, -1.0, ""), tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1052, 1.0, -1.0, -1.0, ""), deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1056, 1.0, -1.0, -1.0, ""), diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index c9c195bd0d..116123c663 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -250,6 +250,12 @@ static constexpr LogField fields[] = { {engine->outputChannels.mafMeasured2, "MAF #2", "kg/h", 1}, {engine->outputChannels.schedulingUsedCount, "schedulingUsedCount", "", 0}, {engine->fuelComputer.totalFuelCorrection, "totalFuelCorrection", "", 0}, + {engine->fuelComputer.running.postCrankingFuelCorrection, "running.postCrankingFuelCorrection", "", 0}, + {engine->fuelComputer.running.intakeTemperatureCoefficient, "fuel: IAT correction", "", 0}, + {engine->fuelComputer.running.coolantTemperatureCoefficient, "fuel: CLT correction", "", 0}, + {engine->fuelComputer.running.timeSinceCrankingInSecs, "running.timeSinceCrankingInSecs", "", 0}, + {engine->fuelComputer.running.baseFuel, "running.baseFuel", "", 0}, + {engine->fuelComputer.running.fuel, "Fuel: actual", "", 0}, {engine->fuelComputer.afrTableYAxis, "afrTableYAxis", "%", 0}, {engine->fuelComputer.targetLambda, "fuel: target lambda", "", 3}, {engine->fuelComputer.targetAFR, "fuel: target AFR", "ratio", 2}, @@ -274,12 +280,6 @@ static constexpr LogField fields[] = { {engine->engineState.crankingFuel.tpsCoefficient, "crankingFuel.tpsCoefficient", "", 0}, {engine->engineState.crankingFuel.durationCoefficient, "crankingFuel.durationCoefficient", "", 0}, {engine->engineState.crankingFuel.fuel, "Fuel: Actual injection", "", 0}, - {engine->engineState.running.postCrankingFuelCorrection, "running.postCrankingFuelCorrection", "", 0}, - {engine->engineState.running.intakeTemperatureCoefficient, "fuel: IAT correction", "", 0}, - {engine->engineState.running.coolantTemperatureCoefficient, "fuel: CLT correction", "", 0}, - {engine->engineState.running.timeSinceCrankingInSecs, "running.timeSinceCrankingInSecs", "", 0}, - {engine->engineState.running.baseFuel, "running.baseFuel", "", 0}, - {engine->engineState.running.fuel, "Fuel: actual", "", 0}, {engine->engineState.sparkDwell, "ignition dwell duration in ms", "", 0}, {engine->engineState.dwellAngle, "ignition dwell duration", "", 0}, {engine->engineState.cltTimingCorrection, "cltTimingCorrection", "deg", 2}, diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index d31f725560..4500fb1380 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Jan 02 22:53:02 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -163,42 +163,6 @@ struct cranking_fuel_s { }; static_assert(sizeof(cranking_fuel_s) == 20); -// start of running_fuel_s -struct running_fuel_s { - /** - * offset 0 - */ - float postCrankingFuelCorrection = (float)0; - /** - * @@GAUGE_NAME_FUEL_IAT_CORR@@ - * offset 4 - */ - float intakeTemperatureCoefficient = (float)0; - /** - * @@GAUGE_NAME_FUEL_CLT_CORR@@ - * offset 8 - */ - float coolantTemperatureCoefficient = (float)0; - /** - * offset 12 - */ - float timeSinceCrankingInSecs = (float)0; - /** - * offset 16 - */ - floatms_t baseFuel = (floatms_t)0; - /** - * Fuel: actual - * Actual injection duration with CLT, IAT and TPS acceleration corrections per cycle, as squirt duration. - * Without injector lag. - * @see baseFuel - * @see actualLastInjection - * offset 20 - */ - floatms_t fuel = (floatms_t)0; -}; -static_assert(sizeof(running_fuel_s) == 24); - // start of engine_state_s struct engine_state_s { /** @@ -246,14 +210,10 @@ struct engine_state_s { * offset 56 */ cranking_fuel_s crankingFuel; - /** - * offset 76 - */ - running_fuel_s running; /** * ignition dwell duration in ms * See also dwellAngle - * offset 100 + * offset 76 */ floatms_t sparkDwell = (floatms_t)0; /** @@ -261,184 +221,184 @@ struct engine_state_s { * as crankshaft angle * NAN if engine is stopped * See also sparkDwell - * offset 104 + * offset 80 */ angle_t dwellAngle = (angle_t)0; /** deg - * offset 108 + * offset 84 */ scaled_channel cltTimingCorrection = (int16_t)0; /** deg - * offset 110 + * offset 86 */ scaled_channel timingIatCorrection = (int16_t)0; /** deg - * offset 112 + * offset 88 */ scaled_channel timingPidCorrection = (int16_t)0; /** * Detected Board ID id - * offset 114 + * offset 90 */ int16_t hellenBoardId = (int16_t)0; /** * @@INDICATOR_NAME_CLUTCH_UP@@ - offset 116 bit 0 */ + offset 92 bit 0 */ bool clutchUpState : 1 {}; /** * @@INDICATOR_NAME_CLUTCH_DOWN@@ - offset 116 bit 1 */ + offset 92 bit 1 */ bool clutchDownState : 1 {}; /** * @@INDICATOR_NAME_BRAKE_DOWN@@ - offset 116 bit 2 */ + offset 92 bit 2 */ bool brakePedalState : 1 {}; /** - offset 116 bit 3 */ + offset 92 bit 3 */ bool startStopState : 1 {}; /** - offset 116 bit 4 */ - bool unusedBit_22_4 : 1 {}; + offset 92 bit 4 */ + bool unusedBit_21_4 : 1 {}; /** - offset 116 bit 5 */ - bool unusedBit_22_5 : 1 {}; + offset 92 bit 5 */ + bool unusedBit_21_5 : 1 {}; /** - offset 116 bit 6 */ - bool unusedBit_22_6 : 1 {}; + offset 92 bit 6 */ + bool unusedBit_21_6 : 1 {}; /** - offset 116 bit 7 */ - bool unusedBit_22_7 : 1 {}; + offset 92 bit 7 */ + bool unusedBit_21_7 : 1 {}; /** - offset 116 bit 8 */ - bool unusedBit_22_8 : 1 {}; + offset 92 bit 8 */ + bool unusedBit_21_8 : 1 {}; /** - offset 116 bit 9 */ - bool unusedBit_22_9 : 1 {}; + offset 92 bit 9 */ + bool unusedBit_21_9 : 1 {}; /** - offset 116 bit 10 */ - bool unusedBit_22_10 : 1 {}; + offset 92 bit 10 */ + bool unusedBit_21_10 : 1 {}; /** - offset 116 bit 11 */ - bool unusedBit_22_11 : 1 {}; + offset 92 bit 11 */ + bool unusedBit_21_11 : 1 {}; /** - offset 116 bit 12 */ - bool unusedBit_22_12 : 1 {}; + offset 92 bit 12 */ + bool unusedBit_21_12 : 1 {}; /** - offset 116 bit 13 */ - bool unusedBit_22_13 : 1 {}; + offset 92 bit 13 */ + bool unusedBit_21_13 : 1 {}; /** - offset 116 bit 14 */ - bool unusedBit_22_14 : 1 {}; + offset 92 bit 14 */ + bool unusedBit_21_14 : 1 {}; /** - offset 116 bit 15 */ - bool unusedBit_22_15 : 1 {}; + offset 92 bit 15 */ + bool unusedBit_21_15 : 1 {}; /** - offset 116 bit 16 */ - bool unusedBit_22_16 : 1 {}; + offset 92 bit 16 */ + bool unusedBit_21_16 : 1 {}; /** - offset 116 bit 17 */ - bool unusedBit_22_17 : 1 {}; + offset 92 bit 17 */ + bool unusedBit_21_17 : 1 {}; /** - offset 116 bit 18 */ - bool unusedBit_22_18 : 1 {}; + offset 92 bit 18 */ + bool unusedBit_21_18 : 1 {}; /** - offset 116 bit 19 */ - bool unusedBit_22_19 : 1 {}; + offset 92 bit 19 */ + bool unusedBit_21_19 : 1 {}; /** - offset 116 bit 20 */ - bool unusedBit_22_20 : 1 {}; + offset 92 bit 20 */ + bool unusedBit_21_20 : 1 {}; /** - offset 116 bit 21 */ - bool unusedBit_22_21 : 1 {}; + offset 92 bit 21 */ + bool unusedBit_21_21 : 1 {}; /** - offset 116 bit 22 */ - bool unusedBit_22_22 : 1 {}; + offset 92 bit 22 */ + bool unusedBit_21_22 : 1 {}; /** - offset 116 bit 23 */ - bool unusedBit_22_23 : 1 {}; + offset 92 bit 23 */ + bool unusedBit_21_23 : 1 {}; /** - offset 116 bit 24 */ - bool unusedBit_22_24 : 1 {}; + offset 92 bit 24 */ + bool unusedBit_21_24 : 1 {}; /** - offset 116 bit 25 */ - bool unusedBit_22_25 : 1 {}; + offset 92 bit 25 */ + bool unusedBit_21_25 : 1 {}; /** - offset 116 bit 26 */ - bool unusedBit_22_26 : 1 {}; + offset 92 bit 26 */ + bool unusedBit_21_26 : 1 {}; /** - offset 116 bit 27 */ - bool unusedBit_22_27 : 1 {}; + offset 92 bit 27 */ + bool unusedBit_21_27 : 1 {}; /** - offset 116 bit 28 */ - bool unusedBit_22_28 : 1 {}; + offset 92 bit 28 */ + bool unusedBit_21_28 : 1 {}; /** - offset 116 bit 29 */ - bool unusedBit_22_29 : 1 {}; + offset 92 bit 29 */ + bool unusedBit_21_29 : 1 {}; /** - offset 116 bit 30 */ - bool unusedBit_22_30 : 1 {}; + offset 92 bit 30 */ + bool unusedBit_21_30 : 1 {}; /** - offset 116 bit 31 */ - bool unusedBit_22_31 : 1 {}; + offset 92 bit 31 */ + bool unusedBit_21_31 : 1 {}; /** - * offset 120 + * offset 96 */ uint32_t startStopStateToggleCounter = (uint32_t)0; /** - * offset 124 + * offset 100 */ float egtValue1 = (float)0; /** - * offset 128 + * offset 104 */ float egtValue2 = (float)0; /** * User-defined RPM hard limit rpm - * offset 132 + * offset 108 */ int16_t desiredRpmLimit = (int16_t)0; /** * need 4 byte alignment units - * offset 134 + * offset 110 */ - uint8_t alignmentFill_at_134[2]; + uint8_t alignmentFill_at_110[2]; /** - * offset 136 + * offset 112 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** - * offset 140 + * offset 116 */ uint32_t sparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 144 + * offset 120 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 148 + * offset 124 */ float ignitionLoad = (float)0; /** % - * offset 152 + * offset 128 */ scaled_channel veTableYAxis = (uint16_t)0; /** * need 4 byte alignment units - * offset 154 + * offset 130 */ - uint8_t alignmentFill_at_154[2]; + uint8_t alignmentFill_at_130[2]; }; -static_assert(sizeof(engine_state_s) == 156); +static_assert(sizeof(engine_state_s) == 132); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Jan 02 22:53:02 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Jan 14 21:07:33 UTC 2023 diff --git a/firmware/controllers/algo/fuel/fuel_computer_generated.h b/firmware/controllers/algo/fuel/fuel_computer_generated.h index c7e1aef759..87f519ca8b 100644 --- a/firmware/controllers/algo/fuel/fuel_computer_generated.h +++ b/firmware/controllers/algo/fuel/fuel_computer_generated.h @@ -1,8 +1,44 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once #include "rusefi_types.h" +// start of running_fuel_s +struct running_fuel_s { + /** + * offset 0 + */ + float postCrankingFuelCorrection = (float)0; + /** + * @@GAUGE_NAME_FUEL_IAT_CORR@@ + * offset 4 + */ + float intakeTemperatureCoefficient = (float)0; + /** + * @@GAUGE_NAME_FUEL_CLT_CORR@@ + * offset 8 + */ + float coolantTemperatureCoefficient = (float)0; + /** + * offset 12 + */ + float timeSinceCrankingInSecs = (float)0; + /** + * offset 16 + */ + floatms_t baseFuel = (floatms_t)0; + /** + * Fuel: actual + * Actual injection duration with CLT, IAT and TPS acceleration corrections per cycle, as squirt duration. + * Without injector lag. + * @see baseFuel + * @see actualLastInjection + * offset 20 + */ + floatms_t fuel = (floatms_t)0; +}; +static_assert(sizeof(running_fuel_s) == 24); + // start of fuel_computer_s struct fuel_computer_s { /** @@ -10,135 +46,139 @@ struct fuel_computer_s { */ float totalFuelCorrection = (float)0; /** - % * offset 4 */ + running_fuel_s running; + /** + % + * offset 28 + */ scaled_channel afrTableYAxis = (uint16_t)0; /** * @@GAUGE_NAME_TARGET_LAMBDA@@ - * offset 6 + * offset 30 */ scaled_channel targetLambda = (uint16_t)0; /** * @@GAUGE_NAME_TARGET_AFR@@ ratio - * offset 8 + * offset 32 */ scaled_channel targetAFR = (uint16_t)0; /** * fuel: stoich ratio ratio - * offset 10 + * offset 34 */ scaled_channel stoichiometricRatio = (uint16_t)0; /** - * offset 12 + * offset 36 */ float sdTcharge_coff = (float)0; /** * SD cylinder mass * Speed-density logic: calculated air mass in one cylinder, in grams - * offset 16 + * offset 40 */ float sdAirMassInOneCylinder = (float)0; /** - offset 20 bit 0 */ + offset 44 bit 0 */ bool sdIsTChargeAirModel : 1 {}; /** - offset 20 bit 1 */ - bool unusedBit_8_1 : 1 {}; + offset 44 bit 1 */ + bool unusedBit_9_1 : 1 {}; /** - offset 20 bit 2 */ - bool unusedBit_8_2 : 1 {}; + offset 44 bit 2 */ + bool unusedBit_9_2 : 1 {}; /** - offset 20 bit 3 */ - bool unusedBit_8_3 : 1 {}; + offset 44 bit 3 */ + bool unusedBit_9_3 : 1 {}; /** - offset 20 bit 4 */ - bool unusedBit_8_4 : 1 {}; + offset 44 bit 4 */ + bool unusedBit_9_4 : 1 {}; /** - offset 20 bit 5 */ - bool unusedBit_8_5 : 1 {}; + offset 44 bit 5 */ + bool unusedBit_9_5 : 1 {}; /** - offset 20 bit 6 */ - bool unusedBit_8_6 : 1 {}; + offset 44 bit 6 */ + bool unusedBit_9_6 : 1 {}; /** - offset 20 bit 7 */ - bool unusedBit_8_7 : 1 {}; + offset 44 bit 7 */ + bool unusedBit_9_7 : 1 {}; /** - offset 20 bit 8 */ - bool unusedBit_8_8 : 1 {}; + offset 44 bit 8 */ + bool unusedBit_9_8 : 1 {}; /** - offset 20 bit 9 */ - bool unusedBit_8_9 : 1 {}; + offset 44 bit 9 */ + bool unusedBit_9_9 : 1 {}; /** - offset 20 bit 10 */ - bool unusedBit_8_10 : 1 {}; + offset 44 bit 10 */ + bool unusedBit_9_10 : 1 {}; /** - offset 20 bit 11 */ - bool unusedBit_8_11 : 1 {}; + offset 44 bit 11 */ + bool unusedBit_9_11 : 1 {}; /** - offset 20 bit 12 */ - bool unusedBit_8_12 : 1 {}; + offset 44 bit 12 */ + bool unusedBit_9_12 : 1 {}; /** - offset 20 bit 13 */ - bool unusedBit_8_13 : 1 {}; + offset 44 bit 13 */ + bool unusedBit_9_13 : 1 {}; /** - offset 20 bit 14 */ - bool unusedBit_8_14 : 1 {}; + offset 44 bit 14 */ + bool unusedBit_9_14 : 1 {}; /** - offset 20 bit 15 */ - bool unusedBit_8_15 : 1 {}; + offset 44 bit 15 */ + bool unusedBit_9_15 : 1 {}; /** - offset 20 bit 16 */ - bool unusedBit_8_16 : 1 {}; + offset 44 bit 16 */ + bool unusedBit_9_16 : 1 {}; /** - offset 20 bit 17 */ - bool unusedBit_8_17 : 1 {}; + offset 44 bit 17 */ + bool unusedBit_9_17 : 1 {}; /** - offset 20 bit 18 */ - bool unusedBit_8_18 : 1 {}; + offset 44 bit 18 */ + bool unusedBit_9_18 : 1 {}; /** - offset 20 bit 19 */ - bool unusedBit_8_19 : 1 {}; + offset 44 bit 19 */ + bool unusedBit_9_19 : 1 {}; /** - offset 20 bit 20 */ - bool unusedBit_8_20 : 1 {}; + offset 44 bit 20 */ + bool unusedBit_9_20 : 1 {}; /** - offset 20 bit 21 */ - bool unusedBit_8_21 : 1 {}; + offset 44 bit 21 */ + bool unusedBit_9_21 : 1 {}; /** - offset 20 bit 22 */ - bool unusedBit_8_22 : 1 {}; + offset 44 bit 22 */ + bool unusedBit_9_22 : 1 {}; /** - offset 20 bit 23 */ - bool unusedBit_8_23 : 1 {}; + offset 44 bit 23 */ + bool unusedBit_9_23 : 1 {}; /** - offset 20 bit 24 */ - bool unusedBit_8_24 : 1 {}; + offset 44 bit 24 */ + bool unusedBit_9_24 : 1 {}; /** - offset 20 bit 25 */ - bool unusedBit_8_25 : 1 {}; + offset 44 bit 25 */ + bool unusedBit_9_25 : 1 {}; /** - offset 20 bit 26 */ - bool unusedBit_8_26 : 1 {}; + offset 44 bit 26 */ + bool unusedBit_9_26 : 1 {}; /** - offset 20 bit 27 */ - bool unusedBit_8_27 : 1 {}; + offset 44 bit 27 */ + bool unusedBit_9_27 : 1 {}; /** - offset 20 bit 28 */ - bool unusedBit_8_28 : 1 {}; + offset 44 bit 28 */ + bool unusedBit_9_28 : 1 {}; /** - offset 20 bit 29 */ - bool unusedBit_8_29 : 1 {}; + offset 44 bit 29 */ + bool unusedBit_9_29 : 1 {}; /** - offset 20 bit 30 */ - bool unusedBit_8_30 : 1 {}; + offset 44 bit 30 */ + bool unusedBit_9_30 : 1 {}; /** - offset 20 bit 31 */ - bool unusedBit_8_31 : 1 {}; + offset 44 bit 31 */ + bool unusedBit_9_31 : 1 {}; }; -static_assert(sizeof(fuel_computer_s) == 24); +static_assert(sizeof(fuel_computer_s) == 48); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 21:07:33 UTC 2023 diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index a8b22260c4..9f0c0953f9 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -477,6 +477,18 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.schedulingUsedCount; case -1779658835: return engine->fuelComputer.totalFuelCorrection; + case -1288205717: + return engine->fuelComputer.running.postCrankingFuelCorrection; + case 197173469: + return engine->fuelComputer.running.intakeTemperatureCoefficient; + case 1822238385: + return engine->fuelComputer.running.coolantTemperatureCoefficient; + case 526786951: + return engine->fuelComputer.running.timeSinceCrankingInSecs; + case -42886021: + return engine->fuelComputer.running.baseFuel; + case -794283008: + return engine->fuelComputer.running.fuel; case 995190836: return engine->fuelComputer.afrTableYAxis; case -734904659: @@ -537,18 +549,6 @@ float getOutputValueByName(const char *name) { return engine->engineState.crankingFuel.durationCoefficient; case -180401224: return engine->engineState.crankingFuel.fuel; - case -1288205717: - return engine->engineState.running.postCrankingFuelCorrection; - case 197173469: - return engine->engineState.running.intakeTemperatureCoefficient; - case 1822238385: - return engine->engineState.running.coolantTemperatureCoefficient; - case 526786951: - return engine->engineState.running.timeSinceCrankingInSecs; - case -42886021: - return engine->engineState.running.baseFuel; - case -794283008: - return engine->engineState.running.fuel; case -903101570: return engine->engineState.sparkDwell; case -1573373756: diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 62e07bd8a7..1460ec3d19 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -86,7 +86,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 Sat Jan 14 10:42:00 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:16 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5366,12 +5366,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5509,31 +5517,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 753c161e48..1c7ae6588b 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -86,7 +86,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 Sat Jan 14 10:41:45 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:00 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5364,12 +5364,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5507,31 +5515,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index ccda813c43..bee4851777 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -86,7 +86,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 Sat Jan 14 10:41:22 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:37 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5360,12 +5360,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5503,31 +5511,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 412a6ea9e8..892333cf7e 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -86,7 +86,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 Sat Jan 14 10:41:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:38 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 8e1b6cc913..8903f8c425 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -86,7 +86,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 Sat Jan 14 10:41:25 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:39 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e8008aaae9..c8359a9ed8 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -86,7 +86,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 Sat Jan 14 10:41:58 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:13 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5366,12 +5366,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5509,31 +5517,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 12c8a6fb3c..abac1e3d49 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -86,7 +86,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 Sat Jan 14 10:41:44 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:58 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5364,12 +5364,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5507,31 +5515,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index e63fedb169..14f2ae2b4c 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -86,7 +86,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 Sat Jan 14 10:41:20 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jan 14 21:07:35 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5366,12 +5366,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5509,31 +5517,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 51a1504634..d646d1b782 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -86,7 +86,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 Sat Jan 14 10:41:56 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:11 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5366,12 +5366,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5509,31 +5517,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index eec949b10a..5f540ecc70 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -86,7 +86,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 Sat Jan 14 10:41:57 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:12 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5366,12 +5366,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5509,31 +5517,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 662f9178d2..07f205ef66 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -86,7 +86,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 Sat Jan 14 10:41:48 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:03 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5366,12 +5366,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5509,31 +5517,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 0ba844c6e3..fe4f0330fd 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -86,7 +86,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 Sat Jan 14 10:41:26 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:41 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis 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 49bdf8416a..0477bc3428 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -86,7 +86,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 Sat Jan 14 10:41:37 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:52 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index e0d120604e..2d2cb1ef0b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -86,7 +86,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 Sat Jan 14 10:41:36 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:51 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 8875cc02ba..2a1bbf1678 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -86,7 +86,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 Sat Jan 14 10:41:30 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:45 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 610ca49322..a50ee5fa96 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -86,7 +86,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 Sat Jan 14 10:41:28 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:43 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 2ba6870704..99ad0da1b1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -86,7 +86,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 Sat Jan 14 10:41:27 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:42 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 42f720d307..082d97f85b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -86,7 +86,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 Sat Jan 14 10:41:31 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:46 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index e1e39b4d4c..32b2bcbcda 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -86,7 +86,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 Sat Jan 14 10:41:33 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:48 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index dd409d72ec..8887c31109 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -86,7 +86,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 Sat Jan 14 10:41:35 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:50 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5361,12 +5361,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5504,31 +5512,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index cc2b73eb0b..f2dc48bb6c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -86,7 +86,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 Sat Jan 14 10:41:32 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:47 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 4efeb315e7..117c75e02f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -86,7 +86,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 Sat Jan 14 10:41:39 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:54 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index ed20e05d89..854433c80b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -86,7 +86,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 Sat Jan 14 10:41:40 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:55 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 8a3a6ababd..9b8b3ec92b 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -86,7 +86,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 Sat Jan 14 10:41:19 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jan 14 21:07:34 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5366,12 +5366,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5509,31 +5517,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 4806bcfda7..559bafd132 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -86,7 +86,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 Sat Jan 14 10:41:46 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:01 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 411628b075..c37e240dff 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -86,7 +86,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 Sat Jan 14 10:41:42 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:57 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5364,12 +5364,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5507,31 +5515,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 7fce0168a9..d6f51ba7da 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -86,7 +86,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 Sat Jan 14 10:41:41 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:07:56 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5364,12 +5364,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5507,31 +5515,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f0f2a5611f..f30b38ed6b 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -86,7 +86,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 Sat Jan 14 10:41:51 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:06 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5360,12 +5360,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5503,31 +5511,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 8a4a26c5fb..e86bb0deac 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -86,7 +86,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 Sat Jan 14 10:41:50 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:05 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5360,12 +5360,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5503,31 +5511,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 085142c4bb..006a4d5f12 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -86,7 +86,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 Sat Jan 14 10:41:53 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:08 UTC 2023 pageSize = 26368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5360,12 +5360,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5503,31 +5511,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 43352d28bb..b42bae0ff8 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -86,7 +86,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 Sat Jan 14 10:41:52 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:07 UTC 2023 pageSize = 26368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5360,12 +5360,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5503,31 +5511,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index e2e85e72b7..cc8da697be 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -86,7 +86,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 Sat Jan 14 10:41:54 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:10 UTC 2023 pageSize = 26368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5360,12 +5360,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5503,31 +5511,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 72b2fc047a..32d86e3017 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -86,7 +86,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 Sat Jan 14 20:06:04 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:02 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5363,12 +5363,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5506,31 +5514,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis 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 295b9a7e0e..3e2175a6f0 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -86,7 +86,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 Sat Jan 14 10:41:21 UTC 2023 +; 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 Sat Jan 14 21:07:36 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5362,12 +5362,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5505,31 +5513,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 8f7af0e5d8..e91b2141c8 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -86,7 +86,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 Sat Jan 14 10:41:59 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 14 21:08:14 UTC 2023 pageSize = 22368 page = 1 @@ -2696,109 +2696,109 @@ pressureDelta = scalar, F32, 792, "kPa", 1, 0 pressureRatio = scalar, F32, 796, "", 1, 0 ; total TS size = 800 totalFuelCorrection = scalar, F32, 800, "", 1, 0 -afrTableYAxis = scalar, U16, 804, "%", 0.01, 0 -targetLambda = scalar, U16, 806, "", 1.0E-4, 0 -targetAFR = scalar, U16, 808, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 810, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 812, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 816, "", 1, 0 -sdIsTChargeAirModel = bits, U32, 820, [0:0] -; total TS size = 824 -retardThresholdRpm = scalar, S32, 824, "", 1, 0 -combinedConditions = bits, U32, 828, [0:0] -launchActivatePinState = bits, U32, 828, [1:1] -isLaunchCondition = bits, U32, 828, [2:2] -isSwitchActivated = bits, U32, 828, [3:3] -isClutchActivated = bits, U32, 828, [4:4] -isValidInputPin = bits, U32, 828, [5:5] -activateSwitchCondition = bits, U32, 828, [6:6] -rpmCondition = bits, U32, 828, [7:7] -speedCondition = bits, U32, 828, [8:8] -tpsCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isAntilagCondition = bits, U32, 832, [0:0] -ALSMinRPMCondition = bits, U32, 832, [1:1] -ALSMaxRPMCondition = bits, U32, 832, [2:2] -ALSMinCLTCondition = bits, U32, 832, [3:3] -ALSMaxCLTCondition = bits, U32, 832, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 832, [5:5] -isALSSwitchActivated = bits, U32, 832, [6:6] -ALSActivatePinState = bits, U32, 832, [7:7] -ALSSwitchCondition = bits, U32, 832, [8:8] -fuelALSCorrection = scalar, F32, 836, "", 1, 0 -timingALSCorrection = scalar, S16, 840, "deg", 0.01, 0 -; total TS size = 844 -isTpsInvalid = bits, U32, 844, [0:0] -m_shouldResetPid = bits, U32, 844, [1:1] -isBelowClosedLoopThreshold = bits, U32, 844, [2:2] -isNotClosedLoop = bits, U32, 844, [3:3] -isZeroRpm = bits, U32, 844, [4:4] -luaTargetAdd = scalar, F32, 848, "", 1, 0 -luaTargetMult = scalar, F32, 852, "", 1, 0 -openLoopPart = scalar, F32, 856, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 860, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 864, "%", 0.5, 0 -boostControlTarget = scalar, S16, 866, "kPa", 0.03333333333333333, 0 +running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 816, "", 1, 0 +running_baseFuel = scalar, F32, 820, "", 1, 0 +running_fuel = scalar, F32, 824, "", 1, 0 +afrTableYAxis = scalar, U16, 828, "%", 0.01, 0 +targetLambda = scalar, U16, 830, "", 1.0E-4, 0 +targetAFR = scalar, U16, 832, "ratio", 0.001, 0 +stoichiometricRatio = scalar, U16, 834, "ratio", 0.001, 0 +sdTcharge_coff = scalar, F32, 836, "", 1, 0 +sdAirMassInOneCylinder = scalar, F32, 840, "", 1, 0 +sdIsTChargeAirModel = bits, U32, 844, [0:0] +; total TS size = 848 +retardThresholdRpm = scalar, S32, 848, "", 1, 0 +combinedConditions = bits, U32, 852, [0:0] +launchActivatePinState = bits, U32, 852, [1:1] +isLaunchCondition = bits, U32, 852, [2:2] +isSwitchActivated = bits, U32, 852, [3:3] +isClutchActivated = bits, U32, 852, [4:4] +isValidInputPin = bits, U32, 852, [5:5] +activateSwitchCondition = bits, U32, 852, [6:6] +rpmCondition = bits, U32, 852, [7:7] +speedCondition = bits, U32, 852, [8:8] +tpsCondition = bits, U32, 852, [9:9] +; total TS size = 856 +isAntilagCondition = bits, U32, 856, [0:0] +ALSMinRPMCondition = bits, U32, 856, [1:1] +ALSMaxRPMCondition = bits, U32, 856, [2:2] +ALSMinCLTCondition = bits, U32, 856, [3:3] +ALSMaxCLTCondition = bits, U32, 856, [4:4] +ALSMaxThrottleIntentCondition = bits, U32, 856, [5:5] +isALSSwitchActivated = bits, U32, 856, [6:6] +ALSActivatePinState = bits, U32, 856, [7:7] +ALSSwitchCondition = bits, U32, 856, [8:8] +fuelALSCorrection = scalar, F32, 860, "", 1, 0 +timingALSCorrection = scalar, S16, 864, "deg", 0.01, 0 ; total TS size = 868 -acButtonState = bits, U32, 868, [0:0] -m_acEnabled = bits, U32, 868, [1:1] -engineTooSlow = bits, U32, 868, [2:2] -engineTooFast = bits, U32, 868, [3:3] -noClt = bits, U32, 868, [4:4] -engineTooHot = bits, U32, 868, [5:5] -tpsTooHigh = bits, U32, 868, [6:6] -isDisabledByLua = bits, U32, 868, [7:7] -acCompressorState = bits, U32, 868, [8:8] -latest_usage_ac_control = scalar, S32, 872, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -cranking = bits, U32, 880, [0:0] -notRunning = bits, U32, 880, [1:1] -disabledWhileEngineStopped = bits, U32, 880, [2:2] -brokenClt = bits, U32, 880, [3:3] -enabledForAc = bits, U32, 880, [4:4] -hot = bits, U32, 880, [5:5] -cold = bits, U32, 880, [6:6] -; total TS size = 884 -isPrime = bits, U32, 884, [0:0] -engineTurnedRecently = bits, U32, 884, [1:1] -isFuelPumpOn = bits, U32, 884, [2:2] -ignitionOn = bits, U32, 884, [3:3] -; total TS size = 888 -isBenchTest = bits, U32, 888, [0:0] -hasIgnitionVoltage = bits, U32, 888, [1:1] -mainRelayState = bits, U32, 888, [2:2] -delayedShutoffRequested = bits, U32, 888, [3:3] +isTpsInvalid = bits, U32, 868, [0:0] +m_shouldResetPid = bits, U32, 868, [1:1] +isBelowClosedLoopThreshold = bits, U32, 868, [2:2] +isNotClosedLoop = bits, U32, 868, [3:3] +isZeroRpm = bits, U32, 868, [4:4] +luaTargetAdd = scalar, F32, 872, "", 1, 0 +luaTargetMult = scalar, F32, 876, "", 1, 0 +openLoopPart = scalar, F32, 880, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 884, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 888, "%", 0.5, 0 +boostControlTarget = scalar, S16, 890, "kPa", 0.03333333333333333, 0 ; total TS size = 892 -lua_fuelAdd = scalar, F32, 892, "", 1, 0 -lua_fuelMult = scalar, F32, 896, "", 1, 0 -lua_clutchUpState = bits, U32, 900, [0:0] -lua_brakePedalState = bits, U32, 900, [1:1] -lua_acRequestState = bits, U32, 900, [2:2] -lua_luaDisableEtb = bits, U32, 900, [3:3] -lua_luaIgnCut = bits, U32, 900, [4:4] -sd_tCharge = scalar, F32, 904, "", 1, 0 -sd_tChargeK = scalar, F32, 908, "", 1, 0 -sd_airFlow = scalar, F32, 912, "", 1, 0 -engineCycleDurationMs = scalar, F32, 916, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 920, "", 1, 0 -currentTpsAdc = scalar, U32, 924, "", 1, 0 -tpsVoltageMCU = scalar, F32, 928, "", 1, 0 -tpsVoltageBoard = scalar, F32, 932, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 936, "", 1, 0 -injectorFlowCorrection = scalar, F32, 940, "", 1, 0 -baroCorrection = scalar, F32, 944, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 948, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 952, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 956, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 960, "", 1, 0 -crankingFuel_fuel = scalar, F32, 964, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 968, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 972, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 980, "", 1, 0 -running_baseFuel = scalar, F32, 984, "", 1, 0 -running_fuel = scalar, F32, 988, "", 1, 0 +acButtonState = bits, U32, 892, [0:0] +m_acEnabled = bits, U32, 892, [1:1] +engineTooSlow = bits, U32, 892, [2:2] +engineTooFast = bits, U32, 892, [3:3] +noClt = bits, U32, 892, [4:4] +engineTooHot = bits, U32, 892, [5:5] +tpsTooHigh = bits, U32, 892, [6:6] +isDisabledByLua = bits, U32, 892, [7:7] +acCompressorState = bits, U32, 892, [8:8] +latest_usage_ac_control = scalar, S32, 896, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 900, "", 1, 0 +; total TS size = 904 +cranking = bits, U32, 904, [0:0] +notRunning = bits, U32, 904, [1:1] +disabledWhileEngineStopped = bits, U32, 904, [2:2] +brokenClt = bits, U32, 904, [3:3] +enabledForAc = bits, U32, 904, [4:4] +hot = bits, U32, 904, [5:5] +cold = bits, U32, 904, [6:6] +; total TS size = 908 +isPrime = bits, U32, 908, [0:0] +engineTurnedRecently = bits, U32, 908, [1:1] +isFuelPumpOn = bits, U32, 908, [2:2] +ignitionOn = bits, U32, 908, [3:3] +; total TS size = 912 +isBenchTest = bits, U32, 912, [0:0] +hasIgnitionVoltage = bits, U32, 912, [1:1] +mainRelayState = bits, U32, 912, [2:2] +delayedShutoffRequested = bits, U32, 912, [3:3] +; total TS size = 916 +lua_fuelAdd = scalar, F32, 916, "", 1, 0 +lua_fuelMult = scalar, F32, 920, "", 1, 0 +lua_clutchUpState = bits, U32, 924, [0:0] +lua_brakePedalState = bits, U32, 924, [1:1] +lua_acRequestState = bits, U32, 924, [2:2] +lua_luaDisableEtb = bits, U32, 924, [3:3] +lua_luaIgnCut = bits, U32, 924, [4:4] +sd_tCharge = scalar, F32, 928, "", 1, 0 +sd_tChargeK = scalar, F32, 932, "", 1, 0 +sd_airFlow = scalar, F32, 936, "", 1, 0 +engineCycleDurationMs = scalar, F32, 940, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 944, "", 1, 0 +currentTpsAdc = scalar, U32, 948, "", 1, 0 +tpsVoltageMCU = scalar, F32, 952, "", 1, 0 +tpsVoltageBoard = scalar, F32, 956, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 960, "", 1, 0 +injectorFlowCorrection = scalar, F32, 964, "", 1, 0 +baroCorrection = scalar, F32, 968, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 972, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 976, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 980, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 984, "", 1, 0 +crankingFuel_fuel = scalar, F32, 988, "", 1, 0 sparkDwell = scalar, F32, 992, "", 1, 0 dwellAngle = scalar, F32, 996, "", 1, 0 cltTimingCorrection = scalar, S16, 1000, "deg", 0.01, 0 @@ -4612,6 +4612,12 @@ entry = m_deadtime, "injectorLag(VBatt)", float, "%.3f" entry = pressureDelta, "fuel: injector pressureDelta", float, "%.3f" entry = pressureRatio, "fuel: injector pressureRatio", float, "%.3f" entry = totalFuelCorrection, "totalFuelCorrection", float, "%.3f" +entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" +entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" +entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" +entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" +entry = running_baseFuel, "running_baseFuel", float, "%.3f" +entry = running_fuel, "Fuel: actual", float, "%.3f" entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" entry = targetLambda, "fuel: target lambda", float, "%.3f" entry = targetAFR, "fuel: target AFR", float, "%.3f" @@ -4701,12 +4707,6 @@ entry = crankingFuel_coolantTemperatureCoefficient, "Cranking: CLT coefficient", entry = crankingFuel_tpsCoefficient, "crankingFuel_tpsCoefficient", float, "%.3f" entry = crankingFuel_durationCoefficient, "crankingFuel_durationCoefficient", float, "%.3f" entry = crankingFuel_fuel, "Fuel: Actual injection", float, "%.3f" -entry = running_postCrankingFuelCorrection, "running_postCrankingFuelCorrection", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "running_baseFuel", float, "%.3f" -entry = running_fuel, "Fuel: actual", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" @@ -5366,12 +5366,20 @@ dialog = fuel_computerDialog, "fuel_computer" panel = fuel_computerIndicatorPanel liveGraph = fuel_computer_1_Graph, "Graph", South graphLine = totalFuelCorrection + graphLine = running_postCrankingFuelCorrection + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + liveGraph = fuel_computer_2_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs + graphLine = running_baseFuel + graphLine = running_fuel graphLine = afrTableYAxis + liveGraph = fuel_computer_3_Graph, "Graph", South graphLine = targetLambda graphLine = targetAFR - liveGraph = fuel_computer_2_Graph, "Graph", South graphLine = stoichiometricRatio graphLine = sdTcharge_coff + liveGraph = fuel_computer_4_Graph, "Graph", South graphLine = sdAirMassInOneCylinder indicatorPanel = launch_control_stateIndicatorPanel, 2 @@ -5509,31 +5517,24 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_5_Graph, "Graph", South graphLine = crankingFuel_durationCoefficient graphLine = crankingFuel_fuel - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - liveGraph = engine_state_6_Graph, "Graph", South - graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - liveGraph = engine_state_7_Graph, "Graph", South graphLine = sparkDwell graphLine = dwellAngle + liveGraph = engine_state_6_Graph, "Graph", South graphLine = cltTimingCorrection graphLine = timingIatCorrection - liveGraph = engine_state_8_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + liveGraph = engine_state_7_Graph, "Graph", South graphLine = startStopStateToggleCounter graphLine = egtValue1 - liveGraph = engine_state_9_Graph, "Graph", South graphLine = egtValue2 graphLine = desiredRpmLimit + liveGraph = engine_state_8_Graph, "Graph", South graphLine = fuelInjectionCounter graphLine = sparkCounter - liveGraph = engine_state_10_Graph, "Graph", South graphLine = fuelingLoad graphLine = ignitionLoad + liveGraph = engine_state_9_Graph, "Graph", South graphLine = veTableYAxis indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index bdde965952..1c3c19e9c1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.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/ac_control.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,17 +401,17 @@ public class AcControl { 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 ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(868); - public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(868); - public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(868); - public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(868); - public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(868); - public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(868); - public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(868); - public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(868); - public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(868); - public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(868); - public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(868); + public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(892); + public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(892); + public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(892); + public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(892); + public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(892); + public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(892); + public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(892); + public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(892); + public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(892); + public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(892); + public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(892); public static final Field[] VALUES = { ACBUTTONSTATE, M_ACENABLED, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java index c7b76985a5..a706d9c310 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.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/antilag_system_state.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,18 +401,18 @@ public class AntilagSystem { 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 ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(832); - public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(832); - public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(832); - public static final Field ALSMINCLTCONDITION = Field.create("ALSMINCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(832); - public static final Field ALSMAXCLTCONDITION = Field.create("ALSMAXCLTCONDITION", 0, FieldType.BIT, 4).setBaseOffset(832); - public static final Field ALSMAXTHROTTLEINTENTCONDITION = Field.create("ALSMAXTHROTTLEINTENTCONDITION", 0, FieldType.BIT, 5).setBaseOffset(832); - public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(832); - public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(832); - public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(832); - public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(832); - public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(832); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(832); + public static final Field ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(856); + public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(856); + public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(856); + public static final Field ALSMINCLTCONDITION = Field.create("ALSMINCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(856); + public static final Field ALSMAXCLTCONDITION = Field.create("ALSMAXCLTCONDITION", 0, FieldType.BIT, 4).setBaseOffset(856); + public static final Field ALSMAXTHROTTLEINTENTCONDITION = Field.create("ALSMAXTHROTTLEINTENTCONDITION", 0, FieldType.BIT, 5).setBaseOffset(856); + public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(856); + public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(856); + public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(856); + public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(856); + public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(856); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(856); public static final Field[] VALUES = { ISANTILAGCONDITION, ALSMINRPMCONDITION, 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 abe696a2fe..3ba04a28c9 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 Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,18 +401,18 @@ public class BoostControl { 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 ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(844); - public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(844); - public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(844); - public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(844); - public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(844); - public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(844); - public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(844); - public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(844); - public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(844); - public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(844); - public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(844); - public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(844); + public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(868); + public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(868); + public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(868); + public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(868); + public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(868); + public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(868); + public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(868); + public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(868); + public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(868); + public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(868); + public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(868); + public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(868); public static final Field[] VALUES = { ISTPSINVALID, M_SHOULDRESETPID, 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 168ecaaa07..aa17865326 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 Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,56 +401,50 @@ 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 LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(892); - public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(892); - public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(892); - public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(892); - public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(892); - public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(892); - public static final Field LUA_LUAIGNCUT = Field.create("LUA_LUAIGNCUT", 8, FieldType.BIT, 4).setBaseOffset(892); - public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(892); - public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(892); - public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(892); - public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(892); - public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(892); - public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(892); - public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(892); - public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(892); - public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(892); - public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(892); - public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 76, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 80, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 84, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 88, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 92, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 96, FieldType.FLOAT).setBaseOffset(892); - public static final Field SPARKDWELL = Field.create("SPARKDWELL", 100, FieldType.FLOAT).setBaseOffset(892); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 104, FieldType.FLOAT).setBaseOffset(892); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 108, FieldType.INT16).setScale(0.01).setBaseOffset(892); - public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 110, FieldType.INT16).setScale(0.01).setBaseOffset(892); - public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 112, FieldType.INT16).setScale(0.01).setBaseOffset(892); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 114, FieldType.INT16).setScale(1.0).setBaseOffset(892); - public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 116, FieldType.BIT, 0).setBaseOffset(892); - public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 116, FieldType.BIT, 1).setBaseOffset(892); - public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 116, FieldType.BIT, 2).setBaseOffset(892); - public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 116, FieldType.BIT, 3).setBaseOffset(892); - public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 120, FieldType.INT).setScale(1.0).setBaseOffset(892); - public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 124, FieldType.FLOAT).setBaseOffset(892); - public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 128, FieldType.FLOAT).setBaseOffset(892); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 132, FieldType.INT16).setScale(1.0).setBaseOffset(892); - public static final Field ALIGNMENTFILL_AT_134 = Field.create("ALIGNMENTFILL_AT_134", 134, FieldType.INT8).setScale(1.0).setBaseOffset(892); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 136, FieldType.INT).setScale(1.0).setBaseOffset(892); - public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 140, FieldType.INT).setScale(1.0).setBaseOffset(892); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 144, FieldType.FLOAT).setBaseOffset(892); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 148, FieldType.FLOAT).setBaseOffset(892); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 152, FieldType.INT16).setScale(0.01).setBaseOffset(892); - public static final Field ALIGNMENTFILL_AT_154 = Field.create("ALIGNMENTFILL_AT_154", 154, FieldType.INT8).setScale(1.0).setBaseOffset(892); + public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(916); + public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(916); + public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(916); + public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(916); + public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(916); + public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(916); + public static final Field LUA_LUAIGNCUT = Field.create("LUA_LUAIGNCUT", 8, FieldType.BIT, 4).setBaseOffset(916); + public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(916); + public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(916); + public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(916); + public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(916); + public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(916); + public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(916); + public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(916); + public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(916); + public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(916); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(916); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(916); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 76, FieldType.FLOAT).setBaseOffset(916); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 80, FieldType.FLOAT).setBaseOffset(916); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 84, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 86, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 88, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 90, FieldType.INT16).setScale(1.0).setBaseOffset(916); + public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 92, FieldType.BIT, 0).setBaseOffset(916); + public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 92, FieldType.BIT, 1).setBaseOffset(916); + public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 92, FieldType.BIT, 2).setBaseOffset(916); + public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 92, FieldType.BIT, 3).setBaseOffset(916); + public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 96, FieldType.INT).setScale(1.0).setBaseOffset(916); + public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 100, FieldType.FLOAT).setBaseOffset(916); + public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 104, FieldType.FLOAT).setBaseOffset(916); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 108, FieldType.INT16).setScale(1.0).setBaseOffset(916); + public static final Field ALIGNMENTFILL_AT_110 = Field.create("ALIGNMENTFILL_AT_110", 110, FieldType.INT8).setScale(1.0).setBaseOffset(916); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 112, FieldType.INT).setScale(1.0).setBaseOffset(916); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 116, FieldType.INT).setScale(1.0).setBaseOffset(916); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 120, FieldType.FLOAT).setBaseOffset(916); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 124, FieldType.FLOAT).setBaseOffset(916); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 128, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field ALIGNMENTFILL_AT_130 = Field.create("ALIGNMENTFILL_AT_130", 130, FieldType.INT8).setScale(1.0).setBaseOffset(916); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -475,12 +469,6 @@ public class EngineState { CRANKINGFUEL_TPSCOEFFICIENT, CRANKINGFUEL_DURATIONCOEFFICIENT, CRANKINGFUEL_FUEL, - RUNNING_POSTCRANKINGFUELCORRECTION, - RUNNING_INTAKETEMPERATURECOEFFICIENT, - RUNNING_COOLANTTEMPERATURECOEFFICIENT, - RUNNING_TIMESINCECRANKINGINSECS, - RUNNING_BASEFUEL, - RUNNING_FUEL, SPARKDWELL, DWELLANGLE, CLTTIMINGCORRECTION, @@ -495,12 +483,12 @@ public class EngineState { EGTVALUE1, EGTVALUE2, DESIREDRPMLIMIT, - ALIGNMENTFILL_AT_134, + ALIGNMENTFILL_AT_110, FUELINJECTIONCOUNTER, SPARKCOUNTER, FUELINGLOAD, IGNITIONLOAD, VETABLEYAXIS, - ALIGNMENTFILL_AT_154, + ALIGNMENTFILL_AT_130, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java index 441cf2a410..6406924a17 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java @@ -1,18 +1,18 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FanControl { - public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(880); - public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(880); - public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(880); - public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(880); - public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(880); - public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(880); - public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(880); + public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(904); + public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(904); + public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(904); + public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(904); + public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(904); + public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(904); + public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(904); public static final Field[] VALUES = { CRANKING, NOTRUNNING, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index ec4d72147d..372ea212fd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.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/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -402,15 +402,27 @@ public class FuelComputer { public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; public static final Field TOTALFUELCORRECTION = Field.create("TOTALFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(800); - public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 4, FieldType.INT16).setScale(0.01).setBaseOffset(800); - public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 6, FieldType.INT16).setScale(1.0E-4).setBaseOffset(800); - public static final Field TARGETAFR = Field.create("TARGETAFR", 8, FieldType.INT16).setScale(0.001).setBaseOffset(800); - public static final Field STOICHIOMETRICRATIO = Field.create("STOICHIOMETRICRATIO", 10, FieldType.INT16).setScale(0.001).setBaseOffset(800); - public static final Field SDTCHARGE_COFF = Field.create("SDTCHARGE_COFF", 12, FieldType.FLOAT).setBaseOffset(800); - public static final Field SDAIRMASSINONECYLINDER = Field.create("SDAIRMASSINONECYLINDER", 16, FieldType.FLOAT).setBaseOffset(800); - public static final Field SDISTCHARGEAIRMODEL = Field.create("SDISTCHARGEAIRMODEL", 20, FieldType.BIT, 0).setBaseOffset(800); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 4, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 8, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 12, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 16, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 20, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 24, FieldType.FLOAT).setBaseOffset(800); + public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 28, FieldType.INT16).setScale(0.01).setBaseOffset(800); + public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 30, FieldType.INT16).setScale(1.0E-4).setBaseOffset(800); + public static final Field TARGETAFR = Field.create("TARGETAFR", 32, FieldType.INT16).setScale(0.001).setBaseOffset(800); + public static final Field STOICHIOMETRICRATIO = Field.create("STOICHIOMETRICRATIO", 34, FieldType.INT16).setScale(0.001).setBaseOffset(800); + public static final Field SDTCHARGE_COFF = Field.create("SDTCHARGE_COFF", 36, FieldType.FLOAT).setBaseOffset(800); + public static final Field SDAIRMASSINONECYLINDER = Field.create("SDAIRMASSINONECYLINDER", 40, FieldType.FLOAT).setBaseOffset(800); + public static final Field SDISTCHARGEAIRMODEL = Field.create("SDISTCHARGEAIRMODEL", 44, FieldType.BIT, 0).setBaseOffset(800); public static final Field[] VALUES = { TOTALFUELCORRECTION, + RUNNING_POSTCRANKINGFUELCORRECTION, + RUNNING_INTAKETEMPERATURECOEFFICIENT, + RUNNING_COOLANTTEMPERATURECOEFFICIENT, + RUNNING_TIMESINCECRANKINGINSECS, + RUNNING_BASEFUEL, + RUNNING_FUEL, AFRTABLEYAXIS, TARGETLAMBDA, TARGETAFR, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java index aad9763964..22e5eb2571 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FuelPump { - public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(884); - public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(884); - public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(884); - public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(884); + public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(908); + public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(908); + public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(908); + public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(908); public static final Field[] VALUES = { ISPRIME, ENGINETURNEDRECENTLY, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java index 13ad3dee1d..fa773d1ca5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java @@ -1,22 +1,22 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LaunchControl { - public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0).setBaseOffset(824); - public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0).setBaseOffset(824); - public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1).setBaseOffset(824); - public static final Field ISLAUNCHCONDITION = Field.create("ISLAUNCHCONDITION", 4, FieldType.BIT, 2).setBaseOffset(824); - public static final Field ISSWITCHACTIVATED = Field.create("ISSWITCHACTIVATED", 4, FieldType.BIT, 3).setBaseOffset(824); - public static final Field ISCLUTCHACTIVATED = Field.create("ISCLUTCHACTIVATED", 4, FieldType.BIT, 4).setBaseOffset(824); - public static final Field ISVALIDINPUTPIN = Field.create("ISVALIDINPUTPIN", 4, FieldType.BIT, 5).setBaseOffset(824); - public static final Field ACTIVATESWITCHCONDITION = Field.create("ACTIVATESWITCHCONDITION", 4, FieldType.BIT, 6).setBaseOffset(824); - public static final Field RPMCONDITION = Field.create("RPMCONDITION", 4, FieldType.BIT, 7).setBaseOffset(824); - public static final Field SPEEDCONDITION = Field.create("SPEEDCONDITION", 4, FieldType.BIT, 8).setBaseOffset(824); - public static final Field TPSCONDITION = Field.create("TPSCONDITION", 4, FieldType.BIT, 9).setBaseOffset(824); + public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0).setBaseOffset(848); + public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0).setBaseOffset(848); + public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1).setBaseOffset(848); + public static final Field ISLAUNCHCONDITION = Field.create("ISLAUNCHCONDITION", 4, FieldType.BIT, 2).setBaseOffset(848); + public static final Field ISSWITCHACTIVATED = Field.create("ISSWITCHACTIVATED", 4, FieldType.BIT, 3).setBaseOffset(848); + public static final Field ISCLUTCHACTIVATED = Field.create("ISCLUTCHACTIVATED", 4, FieldType.BIT, 4).setBaseOffset(848); + public static final Field ISVALIDINPUTPIN = Field.create("ISVALIDINPUTPIN", 4, FieldType.BIT, 5).setBaseOffset(848); + public static final Field ACTIVATESWITCHCONDITION = Field.create("ACTIVATESWITCHCONDITION", 4, FieldType.BIT, 6).setBaseOffset(848); + public static final Field RPMCONDITION = Field.create("RPMCONDITION", 4, FieldType.BIT, 7).setBaseOffset(848); + public static final Field SPEEDCONDITION = Field.create("SPEEDCONDITION", 4, FieldType.BIT, 8).setBaseOffset(848); + public static final Field TPSCONDITION = Field.create("TPSCONDITION", 4, FieldType.BIT, 9).setBaseOffset(848); public static final Field[] VALUES = { RETARDTHRESHOLDRPM, COMBINEDCONDITIONS, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java index ea56b2c308..4af6b406ca 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class MainRelay { - public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(888); - public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(888); - public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(888); - public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(888); + public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(912); + public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(912); + public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(912); + public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(912); public static final Field[] VALUES = { ISBENCHTEST, HASIGNITIONVOLTAGE,