diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 2b6fe11b91..59397f3881 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_31565 +#define SIGNATURE_HASH snap_14182 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1300,12 +1300,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.21.cypress.snap_31565" +#define TS_SIGNATURE "rusEFI 2022.12.21.cypress.snap_14182" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1284 +#define TS_TOTAL_OUTPUT_SIZE 1288 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index ca858d6f83..7f2b666f55 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_55681 +#define SIGNATURE_HASH snap_38314 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1300,12 +1300,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.21.kin.snap_55681" +#define TS_SIGNATURE "rusEFI 2022.12.21.kin.snap_38314" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1284 +#define TS_TOTAL_OUTPUT_SIZE 1288 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 8eff2b4de0..b46d39d6cb 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -992,7 +992,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH snap_41623 +#define SIGNATURE_HASH snap_61116 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1267,12 +1267,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.21.subaru_eg33_f7.snap_41623" +#define TS_SIGNATURE "rusEFI 2022.12.21.subaru_eg33_f7.snap_61116" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1284 +#define TS_TOTAL_OUTPUT_SIZE 1288 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 4262b8c2b1..ed914c7447 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -341,6 +341,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 121c8c14bd..802cf1d0d8 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -73,6 +73,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 7bc012eb63..2d4e3ededf 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -32,18 +32,18 @@ LDS_wideband_state, #define FUEL_COMPUTER_BASE_ADDRESS 800 #define LAUNCH_CONTROL_STATE_BASE_ADDRESS 820 #define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 828 -#define BOOST_CONTROL_BASE_ADDRESS 832 -#define AC_CONTROL_BASE_ADDRESS 856 -#define FAN_CONTROL_BASE_ADDRESS 868 -#define FUEL_PUMP_CONTROL_BASE_ADDRESS 872 -#define MAIN_RELAY_BASE_ADDRESS 876 -#define ENGINE_STATE_BASE_ADDRESS 880 -#define TPS_ACCEL_STATE_BASE_ADDRESS 1036 -#define TRIGGER_CENTRAL_BASE_ADDRESS 1084 -#define TRIGGER_STATE_BASE_ADDRESS 1132 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1156 -#define WALL_FUEL_STATE_BASE_ADDRESS 1160 -#define IDLE_STATE_BASE_ADDRESS 1168 -#define IGNITION_STATE_BASE_ADDRESS 1208 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1224 -#define WIDEBAND_STATE_BASE_ADDRESS 1272 +#define BOOST_CONTROL_BASE_ADDRESS 836 +#define AC_CONTROL_BASE_ADDRESS 860 +#define FAN_CONTROL_BASE_ADDRESS 872 +#define FUEL_PUMP_CONTROL_BASE_ADDRESS 876 +#define MAIN_RELAY_BASE_ADDRESS 880 +#define ENGINE_STATE_BASE_ADDRESS 884 +#define TPS_ACCEL_STATE_BASE_ADDRESS 1040 +#define TRIGGER_CENTRAL_BASE_ADDRESS 1088 +#define TRIGGER_STATE_BASE_ADDRESS 1136 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1160 +#define WALL_FUEL_STATE_BASE_ADDRESS 1164 +#define IDLE_STATE_BASE_ADDRESS 1172 +#define IGNITION_STATE_BASE_ADDRESS 1212 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1228 +#define WIDEBAND_STATE_BASE_ADDRESS 1276 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index a05324f791..b5c7e9c779 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -510,194 +510,195 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index aec6f4f2d5..60d3fec405 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -388,111 +388,112 @@ stoichiometricRatio("fuel: stoich ratio", SensorCategory.SENSOR_INPUTS, FieldTyp sdTcharge_coff("sdTcharge_coff", SensorCategory.SENSOR_INPUTS, FieldType.INT, 808, 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, 812, 1.0, -1.0, -1.0, ""), retardThresholdRpm("retardThresholdRpm", SensorCategory.SENSOR_INPUTS, FieldType.INT, 820, 1.0, -1.0, -1.0, ""), -luaTargetAdd("luaTargetAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), -luaTargetMult("luaTargetMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), -openLoopPart("openLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), -luaOpenLoopAdd("luaOpenLoopAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), -boostControllerClosedLoopPart("Boost Closed Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 852, 0.5, -50.0, 50.0, "%"), -alignmentFill_at_21("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 853, 1.0, -20.0, 100.0, "units"), -boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 854, 0.03333333333333333, 0.0, 0.0, "kPa"), -latest_usage_ac_control("AC latest activity", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), -acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 864, 1.0, -1.0, -1.0, ""), -lua("lua", SensorCategory.SENSOR_INPUTS, FieldType.INT, 880, 1.0, -1.0, -1.0, ""), -sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 892, 1.0, -1.0, -1.0, ""), -engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -1.0, -1.0, ""), -minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -1.0, -1.0, ""), -currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -1.0, -1.0, ""), -tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -1.0, -1.0, ""), -tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 920, 1.0, -1.0, -1.0, ""), -currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), -injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), -baroCorrection("fuel: Barometric pressure mult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -1.0, -1.0, ""), -crankingFuel("crankingFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), -running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), -sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 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, 984, 1.0, -1.0, -1.0, ""), -cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 988, 0.01, -20.0, 20.0, "deg"), -timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 990, 0.01, -20.0, 20.0, "deg"), -timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 992, 0.01, -20.0, 20.0, "deg"), -hellenBoardId("Detected Board ID", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 994, 1.0, 0.0, 3000.0, "id"), -startStopStateToggleCounter("startStopStateToggleCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), -egtValue1("egtValue1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), -egtValue2("egtValue2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), -desiredRpmLimit("User-defined RPM hard limit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1012, 1.0, 0.0, 30000.0, "rpm"), -alignmentFill_at_134("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1014, 1.0, -20.0, 100.0, "units"), -fuelInjectionCounter("fuelInjectionCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, -1.0, -1.0, ""), -sparkCounter("sparkCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, -1.0, -1.0, ""), -fuelingLoad("fuel: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1024, 1.0, -1.0, -1.0, ""), -ignitionLoad("ign: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1028, 1.0, -1.0, -1.0, ""), -veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1032, 0.01, 0.0, 0.0, "%"), -alignmentFill_at_154("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1034, 1.0, -20.0, 100.0, "units"), -tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1036, 1.0, -1.0, -1.0, ""), -tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, -1.0, -1.0, ""), -deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1044, 1.0, -1.0, -1.0, ""), -extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, -1.0, -1.0, ""), -valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1052, 1.0, -1.0, -1.0, ""), -fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1060, 1.0, -1.0, -1.0, ""), -accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1064, 1.0, -1.0, -1.0, ""), -maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1068, 1.0, -1.0, -1.0, ""), -maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1072, 1.0, -1.0, -1.0, ""), -maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1076, 1.0, -1.0, -1.0, ""), -cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1080, 1.0, -1.0, -1.0, ""), -hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1084, 1.0, -1.0, -1.0, ""), -hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1088, 1.0, -1.0, -1.0, ""), -hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1092, 1.0, -1.0, -1.0, ""), -hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1096, 1.0, -1.0, -1.0, ""), -hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -1.0, -1.0, ""), -hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1104, 1.0, -1.0, -1.0, ""), -vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), -mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1120, 1.0, -10000.0, 10000.0, ""), -mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1121, 1.0, -10000.0, 10000.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1122, 1.0, -20.0, 100.0, "units"), -currentEngineDecodedPhase("Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, 0.0, 0.0, "deg"), -triggerToothAngleError("triggerToothAngleError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -30.0, 30.0, "deg"), -crankSynchronizationCounter("Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -10000.0, 10000.0, ""), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -10000.0, 10000.0, ""), -triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1152, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1153, 1.0, -1.0, -1.0, ""), -camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1154, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1155, 1.0, -1.0, -1.0, ""), -wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), -wallFuel("Fuel on the wall\nin ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), -currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), -targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -1.0, -1.0, ""), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1224, 1.0, -1.0, -1.0, ""), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1236, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1240, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1244, 1.0, -10000.0, 10000.0, "%"), -etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1248, 1.0, -10000.0, 10000.0, "%"), -etbDutyRateOfChange("etbDutyRateOfChange", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1256, 1.0, -1.0, -1.0, ""), -etbDutyAverage("etbDutyAverage", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1260, 1.0, -1.0, -1.0, ""), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1264, 1.0, -1.0, -1.0, ""), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1266, 1.0, -1.0, -1.0, ""), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1268, 1.0, -1.0, -1.0, ""), -alignmentFill_at_45("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1269, 1.0, -20.0, 100.0, "units"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1272, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1273, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1274, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1275, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1276, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1278, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1280, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1282, 1.0, -20.0, 100.0, "units"), +fuelALSCorrection("fuelALSCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 832, 1.0, -1.0, -1.0, ""), +luaTargetAdd("luaTargetAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), +luaTargetMult("luaTargetMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), +openLoopPart("openLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), +luaOpenLoopAdd("luaOpenLoopAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 852, 1.0, -1.0, -1.0, ""), +boostControllerClosedLoopPart("Boost Closed Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 856, 0.5, -50.0, 50.0, "%"), +alignmentFill_at_21("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 857, 1.0, -20.0, 100.0, "units"), +boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 858, 0.03333333333333333, 0.0, 0.0, "kPa"), +latest_usage_ac_control("AC latest activity", SensorCategory.SENSOR_INPUTS, FieldType.INT, 864, 1.0, -1.0, -1.0, ""), +acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 868, 1.0, -1.0, -1.0, ""), +lua("lua", SensorCategory.SENSOR_INPUTS, FieldType.INT, 884, 1.0, -1.0, -1.0, ""), +sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 896, 1.0, -1.0, -1.0, ""), +engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -1.0, -1.0, ""), +minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -1.0, -1.0, ""), +currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -1.0, -1.0, ""), +tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 920, 1.0, -1.0, -1.0, ""), +tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), +currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), +injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -1.0, -1.0, ""), +baroCorrection("fuel: Barometric pressure mult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), +crankingFuel("crankingFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), +running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), +sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 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, 988, 1.0, -1.0, -1.0, ""), +cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 992, 0.01, -20.0, 20.0, "deg"), +timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 994, 0.01, -20.0, 20.0, "deg"), +timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 996, 0.01, -20.0, 20.0, "deg"), +hellenBoardId("Detected Board ID", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 998, 1.0, 0.0, 3000.0, "id"), +startStopStateToggleCounter("startStopStateToggleCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), +egtValue1("egtValue1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), +egtValue2("egtValue2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, -1.0, -1.0, ""), +desiredRpmLimit("User-defined RPM hard limit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1016, 1.0, 0.0, 30000.0, "rpm"), +alignmentFill_at_134("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1018, 1.0, -20.0, 100.0, "units"), +fuelInjectionCounter("fuelInjectionCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, -1.0, -1.0, ""), +sparkCounter("sparkCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1024, 1.0, -1.0, -1.0, ""), +fuelingLoad("fuel: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1028, 1.0, -1.0, -1.0, ""), +ignitionLoad("ign: load", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1032, 1.0, -1.0, -1.0, ""), +veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1036, 0.01, 0.0, 0.0, "%"), +alignmentFill_at_154("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1038, 1.0, -20.0, 100.0, "units"), +tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, -1.0, -1.0, ""), +tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1044, 1.0, -1.0, -1.0, ""), +deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1052, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1056, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1064, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1068, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1072, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1076, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1080, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1084, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1088, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1092, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1096, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -1.0, -1.0, ""), +hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1104, 1.0, -1.0, -1.0, ""), +hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), +vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -1.0, -1.0, ""), +mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1120, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1124, 1.0, -10000.0, 10000.0, ""), +mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1125, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1126, 1.0, -20.0, 100.0, "units"), +currentEngineDecodedPhase("Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, 0.0, 0.0, "deg"), +triggerToothAngleError("triggerToothAngleError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -30.0, 30.0, "deg"), +crankSynchronizationCounter("Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -10000.0, 10000.0, ""), +triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1156, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1157, 1.0, -1.0, -1.0, ""), +camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1158, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1159, 1.0, -1.0, -1.0, ""), +wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), +wallFuel("Fuel on the wall\nin ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), +currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), +targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1204, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1208, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1216, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1224, 1.0, -1.0, -1.0, ""), +idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, -1.0, -1.0, ""), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1236, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1240, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1244, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1248, 1.0, -10000.0, 10000.0, "%"), +etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1252, 1.0, -10000.0, 10000.0, "%"), +etbDutyRateOfChange("etbDutyRateOfChange", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1260, 1.0, -1.0, -1.0, ""), +etbDutyAverage("etbDutyAverage", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1264, 1.0, -1.0, -1.0, ""), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1268, 1.0, -1.0, -1.0, ""), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1270, 1.0, -1.0, -1.0, ""), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1272, 1.0, -1.0, -1.0, ""), +alignmentFill_at_45("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1273, 1.0, -20.0, 100.0, "units"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1276, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1277, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1278, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1279, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1280, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1282, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1284, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1286, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 1068022a04..e331196b0c 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / LiveDataProcessor.java -#define TS_TOTAL_OUTPUT_SIZE 1284 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1288 \ No newline at end of file diff --git a/firmware/controllers/algo/antilag_system_state_generated.h b/firmware/controllers/algo/antilag_system_state_generated.h index 6127423840..b2bdfc1614 100644 --- a/firmware/controllers/algo/antilag_system_state_generated.h +++ b/firmware/controllers/algo/antilag_system_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Sat Dec 17 01:28:44 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -101,8 +101,12 @@ struct antilag_system_state_s { /** offset 0 bit 31 */ bool unusedBit_10_31 : 1 {}; + /** + * offset 4 + */ + float fuelALSCorrection = (float)0; }; -static_assert(sizeof(antilag_system_state_s) == 4); +static_assert(sizeof(antilag_system_state_s) == 8); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Sat Dec 17 01:28:44 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Wed Dec 21 23:51:25 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e055efe79a..f45bd9e74e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_31565 +#define SIGNATURE_HASH snap_14182 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1300,12 +1300,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.12.21.all.snap_31565" +#define TS_SIGNATURE "rusEFI 2022.12.21.all.snap_14182" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1284 +#define TS_TOTAL_OUTPUT_SIZE 1288 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index d67f61d173..cef0f6eb78 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_29442 -#define TS_SIGNATURE "rusEFI 2022.12.21.48way.snap_29442" +#define SIGNATURE_HASH snap_16169 +#define TS_SIGNATURE "rusEFI 2022.12.21.48way.snap_16169" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index c7edca096a..fd501ee4ea 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_31565 -#define TS_SIGNATURE "rusEFI 2022.12.21.all.snap_31565" +#define SIGNATURE_HASH snap_14182 +#define TS_SIGNATURE "rusEFI 2022.12.21.all.snap_14182" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index b80e879233..ec9be8d1a8 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_58913 -#define TS_SIGNATURE "rusEFI 2022.12.21.alphax-2chan.snap_58913" +#define SIGNATURE_HASH snap_43530 +#define TS_SIGNATURE "rusEFI 2022.12.21.alphax-2chan.snap_43530" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 57226ecf68..c8fdef762c 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_27236 -#define TS_SIGNATURE "rusEFI 2022.12.21.alphax-4chan.snap_27236" +#define SIGNATURE_HASH snap_9807 +#define TS_SIGNATURE "rusEFI 2022.12.21.alphax-4chan.snap_9807" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 0f1971c944..02c8f7be43 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_21956 -#define TS_SIGNATURE "rusEFI 2022.12.21.alphax-8chan.snap_21956" +#define SIGNATURE_HASH snap_6639 +#define TS_SIGNATURE "rusEFI 2022.12.21.alphax-8chan.snap_6639" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index a7780be73c..152258e49d 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_36458 -#define TS_SIGNATURE "rusEFI 2022.12.21.atlas.snap_36458" +#define SIGNATURE_HASH snap_49729 +#define TS_SIGNATURE "rusEFI 2022.12.21.atlas.snap_49729" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 117f201055..945f76497d 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_10932 -#define TS_SIGNATURE "rusEFI 2022.12.21.core8.snap_10932" +#define SIGNATURE_HASH snap_26271 +#define TS_SIGNATURE "rusEFI 2022.12.21.core8.snap_26271" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 8eb7a403cb..69285e4e28 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_31565 -#define TS_SIGNATURE "rusEFI 2022.12.21.cypress.snap_31565" +#define SIGNATURE_HASH snap_14182 +#define TS_SIGNATURE "rusEFI 2022.12.21.cypress.snap_14182" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 21e96dbfd7..4a016ed841 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_31565 -#define TS_SIGNATURE "rusEFI 2022.12.21.f407-discovery.snap_31565" +#define SIGNATURE_HASH snap_14182 +#define TS_SIGNATURE "rusEFI 2022.12.21.f407-discovery.snap_14182" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index b6919050fe..492a34b4fc 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_31565 -#define TS_SIGNATURE "rusEFI 2022.12.21.f429-discovery.snap_31565" +#define SIGNATURE_HASH snap_14182 +#define TS_SIGNATURE "rusEFI 2022.12.21.f429-discovery.snap_14182" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7826f51c22..19f39f3729 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_34697 -#define TS_SIGNATURE "rusEFI 2022.12.21.frankenso_na6.snap_34697" +#define SIGNATURE_HASH snap_52130 +#define TS_SIGNATURE "rusEFI 2022.12.21.frankenso_na6.snap_52130" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 15f3b6cfba..3d20905ba9 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_15794 -#define TS_SIGNATURE "rusEFI 2022.12.21.harley81.snap_15794" +#define SIGNATURE_HASH snap_29081 +#define TS_SIGNATURE "rusEFI 2022.12.21.harley81.snap_29081" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 7d7951d1fd..9da2a5b9db 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_6217 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen-gm-e67.snap_6217" +#define SIGNATURE_HASH snap_21602 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen-gm-e67.snap_21602" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index eb8b31eac7..3860751fac 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_19073 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen-nb1.snap_19073" +#define SIGNATURE_HASH snap_1706 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen-nb1.snap_1706" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 0b4988ad6d..c89a09b504 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_34527 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen121nissan.snap_34527" +#define SIGNATURE_HASH snap_51956 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen121nissan.snap_51956" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 4ea808a256..26b7e797db 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_60496 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen121vag.snap_60496" +#define SIGNATURE_HASH snap_41083 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen121vag.snap_41083" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index fcf365a635..20422c4c4b 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_1654 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen128.snap_1654" +#define SIGNATURE_HASH snap_19037 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen128.snap_19037" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 88611b75c4..3782368f87 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_16814 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen154hyundai.snap_16814" +#define SIGNATURE_HASH snap_3461 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen154hyundai.snap_3461" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index c28ea0bbc4..2b64dbf650 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_30150 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen72.snap_30150" +#define SIGNATURE_HASH snap_14829 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen72.snap_14829" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 4d756fc7db..8dbe22c130 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_58672 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen81.snap_58672" +#define SIGNATURE_HASH snap_43291 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen81.snap_43291" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index b8c3eb0881..491df5ac54 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_26753 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellen88bmw.snap_26753" +#define SIGNATURE_HASH snap_9386 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellen88bmw.snap_9386" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 005e1bc998..036c5862f8 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_51834 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellenNA6.snap_51834" +#define SIGNATURE_HASH snap_34385 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellenNA6.snap_34385" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index aa84c0e105..b76f5d066a 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_51877 -#define TS_SIGNATURE "rusEFI 2022.12.21.hellenNA8_96.snap_51877" +#define SIGNATURE_HASH snap_34446 +#define TS_SIGNATURE "rusEFI 2022.12.21.hellenNA8_96.snap_34446" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index e742612132..d4e7fd63f6 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_55681 -#define TS_SIGNATURE "rusEFI 2022.12.21.kin.snap_55681" +#define SIGNATURE_HASH snap_38314 +#define TS_SIGNATURE "rusEFI 2022.12.21.kin.snap_38314" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f25134a74f..d74bc25746 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_7245 -#define TS_SIGNATURE "rusEFI 2022.12.21.mre_f4.snap_7245" +#define SIGNATURE_HASH snap_20582 +#define TS_SIGNATURE "rusEFI 2022.12.21.mre_f4.snap_20582" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index bf0ac341a3..94a4abeb00 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_7245 -#define TS_SIGNATURE "rusEFI 2022.12.21.mre_f7.snap_7245" +#define SIGNATURE_HASH snap_20582 +#define TS_SIGNATURE "rusEFI 2022.12.21.mre_f7.snap_20582" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 10c8896e1d..6dc8cb42c5 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_41643 -#define TS_SIGNATURE "rusEFI 2022.12.21.prometheus_405.snap_41643" +#define SIGNATURE_HASH snap_61056 +#define TS_SIGNATURE "rusEFI 2022.12.21.prometheus_405.snap_61056" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index b7c45f80b7..604e8cc3c2 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_41643 -#define TS_SIGNATURE "rusEFI 2022.12.21.prometheus_469.snap_41643" +#define SIGNATURE_HASH snap_61056 +#define TS_SIGNATURE "rusEFI 2022.12.21.prometheus_469.snap_61056" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 88edb1b7ef..a6806958f6 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_48187 -#define TS_SIGNATURE "rusEFI 2022.12.21.proteus_f4.snap_48187" +#define SIGNATURE_HASH snap_61456 +#define TS_SIGNATURE "rusEFI 2022.12.21.proteus_f4.snap_61456" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 2c59ba153b..6c5d1132c5 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_48187 -#define TS_SIGNATURE "rusEFI 2022.12.21.proteus_f7.snap_48187" +#define SIGNATURE_HASH snap_61456 +#define TS_SIGNATURE "rusEFI 2022.12.21.proteus_f7.snap_61456" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 2777ca69e7..030747f250 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_48187 -#define TS_SIGNATURE "rusEFI 2022.12.21.proteus_h7.snap_48187" +#define SIGNATURE_HASH snap_61456 +#define TS_SIGNATURE "rusEFI 2022.12.21.proteus_h7.snap_61456" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 03d6f2c6c8..12099a5558 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_41623 -#define TS_SIGNATURE "rusEFI 2022.12.21.subaru_eg33_f7.snap_41623" +#define SIGNATURE_HASH snap_61116 +#define TS_SIGNATURE "rusEFI 2022.12.21.subaru_eg33_f7.snap_61116" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 58406f6884..249bb12cfb 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_46361 -#define TS_SIGNATURE "rusEFI 2022.12.21.tdg-pdm8.snap_46361" +#define SIGNATURE_HASH snap_63794 +#define TS_SIGNATURE "rusEFI 2022.12.21.tdg-pdm8.snap_63794" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 5e73419ad3..3c90a954d5 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.all.snap_31565" + signature = "rusEFI 2022.12.21.all.snap_14182" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.all.snap_31565" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.all.snap_14182" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:52:04 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5380,6 +5382,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index bc0f9297fb..189aa17f30 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.48way.snap_29442" + signature = "rusEFI 2022.12.21.48way.snap_16169" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.48way.snap_29442" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.48way.snap_16169" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:51 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5378,6 +5380,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 501affa6df..e72b2656eb 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.alphax-2chan.snap_58913" + signature = "rusEFI 2022.12.21.alphax-2chan.snap_43530" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.alphax-2chan.snap_58913" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.alphax-2chan.snap_43530" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:29 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5374,6 +5376,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 36df20020f..96aacb3a05 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.alphax-4chan.snap_27236" + signature = "rusEFI 2022.12.21.alphax-4chan.snap_9807" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.alphax-4chan.snap_27236" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.alphax-4chan.snap_9807" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:30 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index c9c45d9c37..f8d8f8c9a3 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.alphax-8chan.snap_21956" + signature = "rusEFI 2022.12.21.alphax-8chan.snap_6639" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.alphax-8chan.snap_21956" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.alphax-8chan.snap_6639" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:32 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index ac84c7c78d..884d58659e 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.atlas.snap_36458" + signature = "rusEFI 2022.12.21.atlas.snap_49729" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.atlas.snap_36458" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.atlas.snap_49729" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:52:02 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5380,6 +5382,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index eef199b708..5a835e91f1 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.core8.snap_10932" + signature = "rusEFI 2022.12.21.core8.snap_26271" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.core8.snap_10932" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.core8.snap_26271" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:50 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5378,6 +5380,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 0d8cec3c02..0b368cfa7b 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.cypress.snap_31565" + signature = "rusEFI 2022.12.21.cypress.snap_14182" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.cypress.snap_31565" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.cypress.snap_14182" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Dec 21 23:51:27 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5380,6 +5382,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index d1a06372e3..8c14b0add8 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.f407-discovery.snap_31565" + signature = "rusEFI 2022.12.21.f407-discovery.snap_14182" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.f407-discovery.snap_31565" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.f407-discovery.snap_14182" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:52:00 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5380,6 +5382,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index b70e55b626..be6fd5f65c 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.f429-discovery.snap_31565" + signature = "rusEFI 2022.12.21.f429-discovery.snap_14182" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.f429-discovery.snap_31565" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.f429-discovery.snap_14182" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:52:01 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5380,6 +5382,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 9e3c210ec1..d6255f768a 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.frankenso_na6.snap_34697" + signature = "rusEFI 2022.12.21.frankenso_na6.snap_52130" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.frankenso_na6.snap_34697" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.frankenso_na6.snap_52130" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:52 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5380,6 +5382,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 229d466ac2..9905715251 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.harley81.snap_15794" + signature = "rusEFI 2022.12.21.harley81.snap_29081" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.harley81.snap_15794" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.harley81.snap_29081" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:33 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 3f5d34b31f..4682203a5f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen-gm-e67.snap_6217" + signature = "rusEFI 2022.12.21.hellen-gm-e67.snap_21602" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen-gm-e67.snap_6217" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen-gm-e67.snap_21602" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:44 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index ddbf65a789..0ec097d4b3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen-nb1.snap_19073" + signature = "rusEFI 2022.12.21.hellen-nb1.snap_1706" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen-nb1.snap_19073" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen-nb1.snap_1706" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:42 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 0d1670e0f4..c438e51248 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen121nissan.snap_34527" + signature = "rusEFI 2022.12.21.hellen121nissan.snap_51956" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen121nissan.snap_34527" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen121nissan.snap_51956" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:36 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index ec8ce59114..ad65393d5e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen121vag.snap_60496" + signature = "rusEFI 2022.12.21.hellen121vag.snap_41083" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen121vag.snap_60496" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen121vag.snap_41083" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:35 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index d08ec6c35a..faf2a5f81f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen128.snap_1654" + signature = "rusEFI 2022.12.21.hellen128.snap_19037" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen128.snap_1654" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen128.snap_19037" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:34 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index b4ea467351..e6b4db146a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen154hyundai.snap_16814" + signature = "rusEFI 2022.12.21.hellen154hyundai.snap_3461" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen154hyundai.snap_16814" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen154hyundai.snap_3461" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:38 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 4bab09b0a3..7327434757 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen72.snap_30150" + signature = "rusEFI 2022.12.21.hellen72.snap_14829" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen72.snap_30150" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen72.snap_14829" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:40 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index b1346d9872..58a72a4475 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen81.snap_58672" + signature = "rusEFI 2022.12.21.hellen81.snap_43291" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen81.snap_58672" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen81.snap_43291" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:41 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5375,6 +5377,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 18b781bd41..8bc1f6db9f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellen88bmw.snap_26753" + signature = "rusEFI 2022.12.21.hellen88bmw.snap_9386" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellen88bmw.snap_26753" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellen88bmw.snap_9386" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:39 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index d442222ade..1fa4a08c6a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellenNA6.snap_51834" + signature = "rusEFI 2022.12.21.hellenNA6.snap_34385" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellenNA6.snap_51834" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellenNA6.snap_34385" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:45 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 14a40ba584..2f112bde3f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.hellenNA8_96.snap_51877" + signature = "rusEFI 2022.12.21.hellenNA8_96.snap_34446" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.hellenNA8_96.snap_51877" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.hellenNA8_96.snap_34446" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:46 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5377,6 +5379,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 47688d96fa..c5116adb26 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.kin.snap_55681" + signature = "rusEFI 2022.12.21.kin.snap_38314" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.kin.snap_55681" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.kin.snap_38314" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Dec 21 23:51:26 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5380,6 +5382,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 623d21e15a..2a4be609ce 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.mre_f4.snap_7245" + signature = "rusEFI 2022.12.21.mre_f4.snap_20582" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.mre_f4.snap_7245" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.mre_f4.snap_20582" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:48 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5378,6 +5380,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 4cbf720f77..2698204c61 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.mre_f7.snap_7245" + signature = "rusEFI 2022.12.21.mre_f7.snap_20582" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.mre_f7.snap_7245" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.mre_f7.snap_20582" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:47 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5378,6 +5380,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index e2d41e4e77..d7c3f17a14 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.prometheus_405.snap_41643" + signature = "rusEFI 2022.12.21.prometheus_405.snap_61056" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.prometheus_405.snap_41643" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.prometheus_405.snap_61056" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:55 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5374,6 +5376,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 280312baa8..adfad1ba5c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.prometheus_469.snap_41643" + signature = "rusEFI 2022.12.21.prometheus_469.snap_61056" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.prometheus_469.snap_41643" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.prometheus_469.snap_61056" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:54 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5374,6 +5376,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a583babda3..af4dde16d5 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.proteus_f4.snap_48187" + signature = "rusEFI 2022.12.21.proteus_f4.snap_61456" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.proteus_f4.snap_48187" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.proteus_f4.snap_61456" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:57 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5374,6 +5376,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index fd6064cc5c..87da2e2c3e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.proteus_f7.snap_48187" + signature = "rusEFI 2022.12.21.proteus_f7.snap_61456" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.proteus_f7.snap_48187" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.proteus_f7.snap_61456" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:56 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5374,6 +5376,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 161937fb00..26d3cb400f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.proteus_h7.snap_48187" + signature = "rusEFI 2022.12.21.proteus_h7.snap_61456" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.proteus_h7.snap_48187" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.proteus_h7.snap_61456" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:58 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5374,6 +5376,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 9404f575a1..c49b91a31a 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.subaru_eg33_f7.snap_41623" + signature = "rusEFI 2022.12.21.subaru_eg33_f7.snap_61116" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.subaru_eg33_f7.snap_41623" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.subaru_eg33_f7.snap_61116" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:32:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Dec 21 23:51:28 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5376,6 +5378,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 5d88af9c33..761e68990b 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.12.21.tdg-pdm8.snap_46361" + signature = "rusEFI 2022.12.21.tdg-pdm8.snap_63794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.12.21.tdg-pdm8.snap_46361" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.12.21.tdg-pdm8.snap_63794" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -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 Wed Dec 21 23:33:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:52:03 UTC 2022 pageSize = 22896 page = 1 @@ -2184,7 +2184,7 @@ veBlends4_blendValues = array, U08, 22886, [8], "%", 0.5, 0, 0, 100, 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1284 + ochBlockSize = 1288 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2707,197 +2707,198 @@ AntilagcombinedConditions = bits, U32, 828, [6:6] isALSSwitchActivated = bits, U32, 828, [7:7] ALSActivatePinState = bits, U32, 828, [8:8] ALSSwitchCondition = bits, U32, 828, [9:9] -; total TS size = 832 -isTpsInvalid = bits, U32, 832, [0:0] -m_shouldResetPid = bits, U32, 832, [1:1] -isBelowClosedLoopThreshold = bits, U32, 832, [2:2] -isNotClosedLoop = bits, U32, 832, [3:3] -isZeroRpm = bits, U32, 832, [4:4] -luaTargetAdd = scalar, F32, 836, "", 1, 0 -luaTargetMult = scalar, F32, 840, "", 1, 0 -openLoopPart = scalar, F32, 844, "", 1, 0 -luaOpenLoopAdd = scalar, F32, 848, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 852, "%", 0.5, 0 -boostControlTarget = scalar, S16, 854, "kPa", 0.03333333333333333, 0 -; total TS size = 856 -acButtonState = bits, U32, 856, [0:0] -m_acEnabled = bits, U32, 856, [1:1] -engineTooSlow = bits, U32, 856, [2:2] -engineTooFast = bits, U32, 856, [3:3] -noClt = bits, U32, 856, [4:4] -engineTooHot = bits, U32, 856, [5:5] -tpsTooHigh = bits, U32, 856, [6:6] -isDisabledByLua = bits, U32, 856, [7:7] -acCompressorState = bits, U32, 856, [8:8] -latest_usage_ac_control = scalar, S32, 860, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 864, "", 1, 0 -; total TS size = 868 -cranking = bits, U32, 868, [0:0] -notRunning = bits, U32, 868, [1:1] -disabledWhileEngineStopped = bits, U32, 868, [2:2] -brokenClt = bits, U32, 868, [3:3] -enabledForAc = bits, U32, 868, [4:4] -hot = bits, U32, 868, [5:5] -cold = bits, U32, 868, [6:6] +fuelALSCorrection = scalar, F32, 832, "", 1, 0 +; total TS size = 836 +isTpsInvalid = bits, U32, 836, [0:0] +m_shouldResetPid = bits, U32, 836, [1:1] +isBelowClosedLoopThreshold = bits, U32, 836, [2:2] +isNotClosedLoop = bits, U32, 836, [3:3] +isZeroRpm = bits, U32, 836, [4:4] +luaTargetAdd = scalar, F32, 840, "", 1, 0 +luaTargetMult = scalar, F32, 844, "", 1, 0 +openLoopPart = scalar, F32, 848, "", 1, 0 +luaOpenLoopAdd = scalar, F32, 852, "", 1, 0 +boostControllerClosedLoopPart = scalar, S08, 856, "%", 0.5, 0 +boostControlTarget = scalar, S16, 858, "kPa", 0.03333333333333333, 0 +; total TS size = 860 +acButtonState = bits, U32, 860, [0:0] +m_acEnabled = bits, U32, 860, [1:1] +engineTooSlow = bits, U32, 860, [2:2] +engineTooFast = bits, U32, 860, [3:3] +noClt = bits, U32, 860, [4:4] +engineTooHot = bits, U32, 860, [5:5] +tpsTooHigh = bits, U32, 860, [6:6] +isDisabledByLua = bits, U32, 860, [7:7] +acCompressorState = bits, U32, 860, [8:8] +latest_usage_ac_control = scalar, S32, 864, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 868, "", 1, 0 ; total TS size = 872 -isPrime = bits, U32, 872, [0:0] -engineTurnedRecently = bits, U32, 872, [1:1] -isFuelPumpOn = bits, U32, 872, [2:2] -ignitionOn = bits, U32, 872, [3:3] +cranking = bits, U32, 872, [0:0] +notRunning = bits, U32, 872, [1:1] +disabledWhileEngineStopped = bits, U32, 872, [2:2] +brokenClt = bits, U32, 872, [3:3] +enabledForAc = bits, U32, 872, [4:4] +hot = bits, U32, 872, [5:5] +cold = bits, U32, 872, [6:6] ; total TS size = 876 -isBenchTest = bits, U32, 876, [0:0] -hasIgnitionVoltage = bits, U32, 876, [1:1] -mainRelayState = bits, U32, 876, [2:2] -delayedShutoffRequested = bits, U32, 876, [3:3] +isPrime = bits, U32, 876, [0:0] +engineTurnedRecently = bits, U32, 876, [1:1] +isFuelPumpOn = bits, U32, 876, [2:2] +ignitionOn = bits, U32, 876, [3:3] ; total TS size = 880 -lua_fuelAdd = scalar, F32, 880, "", 1, 0 -lua_fuelMult = scalar, F32, 884, "", 1, 0 -lua_clutchUpState = bits, U32, 888, [0:0] -lua_brakePedalState = bits, U32, 888, [1:1] -lua_acRequestState = bits, U32, 888, [2:2] -lua_luaDisableEtb = bits, U32, 888, [3:3] -sd_tCharge = scalar, F32, 892, "", 1, 0 -sd_tChargeK = scalar, F32, 896, "", 1, 0 -sd_airFlow = scalar, F32, 900, "", 1, 0 -engineCycleDurationMs = scalar, F32, 904, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 908, "", 1, 0 -currentTpsAdc = scalar, U32, 912, "", 1, 0 -tpsVoltageMCU = scalar, F32, 916, "", 1, 0 -tpsVoltageBoard = scalar, F32, 920, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 924, "", 1, 0 -injectorFlowCorrection = scalar, F32, 928, "", 1, 0 -baroCorrection = scalar, F32, 932, "", 1, 0 -crankingFuel_baseFuel = scalar, F32, 936, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 940, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 944, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 948, "", 1, 0 -crankingFuel_fuel = scalar, F32, 952, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 956, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 960, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 964, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 968, "", 1, 0 -running_baseFuel = scalar, F32, 972, "", 1, 0 -running_fuel = scalar, F32, 976, "", 1, 0 -sparkDwell = scalar, F32, 980, "", 1, 0 -dwellAngle = scalar, F32, 984, "", 1, 0 -cltTimingCorrection = scalar, S16, 988, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 990, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 992, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 994, "id", 1, 0 -clutchUpState = bits, U32, 996, [0:0] -clutchDownState = bits, U32, 996, [1:1] -brakePedalState = bits, U32, 996, [2:2] -startStopState = bits, U32, 996, [3:3] -startStopStateToggleCounter = scalar, U32, 1000, "", 1, 0 -egtValue1 = scalar, F32, 1004, "", 1, 0 -egtValue2 = scalar, F32, 1008, "", 1, 0 -desiredRpmLimit = scalar, S16, 1012, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1016, "", 1, 0 -sparkCounter = scalar, U32, 1020, "", 1, 0 -fuelingLoad = scalar, F32, 1024, "", 1, 0 -ignitionLoad = scalar, F32, 1028, "", 1, 0 -veTableYAxis = scalar, U16, 1032, "%", 0.01, 0 -; total TS size = 1036 -tpsFrom = scalar, F32, 1036 -tpsTo = scalar, F32, 1040 -deltaTps = scalar, F32, 1044 -extraFuel = scalar, F32, 1048, "", 1, 0 -valueFromTable = scalar, F32, 1052, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1056, [0:0] -isBelowDecelThreshold = bits, U32, 1056, [1:1] -isTimeToResetAccumulator = bits, U32, 1056, [2:2] -isFractionalEnrichment = bits, U32, 1056, [3:3] -belowEpsilon = bits, U32, 1056, [4:4] -tooShort = bits, U32, 1056, [5:5] -fractionalInjFuel = scalar, F32, 1060, "", 1, 0 -accumulatedValue = scalar, F32, 1064, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1068, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1072, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1076, "", 1, 0 -cycleCnt = scalar, S32, 1080, "", 1, 0 -; total TS size = 1084 -hwEventCounters1 = scalar, U32, 1084, "", 1, 0 -hwEventCounters2 = scalar, U32, 1088, "", 1, 0 -hwEventCounters3 = scalar, U32, 1092, "", 1, 0 -hwEventCounters4 = scalar, U32, 1096, "", 1, 0 -hwEventCounters5 = scalar, U32, 1100, "", 1, 0 -hwEventCounters6 = scalar, U32, 1104, "", 1, 0 -vvtCamCounter = scalar, U32, 1108, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1112, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1116, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1120, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1121, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1124, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1128, "deg", 1, 0 -; total TS size = 1132 -crankSynchronizationCounter = scalar, U32, 1132, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1136, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1140, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1144, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1148, "", 1, 0 -triggerStateIndex = scalar, U08, 1152, "", 1, 0 -vvtCounter = scalar, U08, 1153, "", 1, 0 -camResyncCounter = scalar, U08, 1154, "", 1, 0 -vvtStateIndex = scalar, U08, 1155, "", 1, 0 -; total TS size = 1156 -m_hasSynchronizedPhase = bits, U32, 1156, [0:0] +isBenchTest = bits, U32, 880, [0:0] +hasIgnitionVoltage = bits, U32, 880, [1:1] +mainRelayState = bits, U32, 880, [2:2] +delayedShutoffRequested = bits, U32, 880, [3:3] +; total TS size = 884 +lua_fuelAdd = scalar, F32, 884, "", 1, 0 +lua_fuelMult = scalar, F32, 888, "", 1, 0 +lua_clutchUpState = bits, U32, 892, [0:0] +lua_brakePedalState = bits, U32, 892, [1:1] +lua_acRequestState = bits, U32, 892, [2:2] +lua_luaDisableEtb = bits, U32, 892, [3:3] +sd_tCharge = scalar, F32, 896, "", 1, 0 +sd_tChargeK = scalar, F32, 900, "", 1, 0 +sd_airFlow = scalar, F32, 904, "", 1, 0 +engineCycleDurationMs = scalar, F32, 908, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 912, "", 1, 0 +currentTpsAdc = scalar, U32, 916, "", 1, 0 +tpsVoltageMCU = scalar, F32, 920, "", 1, 0 +tpsVoltageBoard = scalar, F32, 924, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 928, "", 1, 0 +injectorFlowCorrection = scalar, F32, 932, "", 1, 0 +baroCorrection = scalar, F32, 936, "", 1, 0 +crankingFuel_baseFuel = scalar, F32, 940, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 944, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 948, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 952, "", 1, 0 +crankingFuel_fuel = scalar, F32, 956, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 960, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 964, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 968, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 972, "", 1, 0 +running_baseFuel = scalar, F32, 976, "", 1, 0 +running_fuel = scalar, F32, 980, "", 1, 0 +sparkDwell = scalar, F32, 984, "", 1, 0 +dwellAngle = scalar, F32, 988, "", 1, 0 +cltTimingCorrection = scalar, S16, 992, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 994, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 996, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 998, "id", 1, 0 +clutchUpState = bits, U32, 1000, [0:0] +clutchDownState = bits, U32, 1000, [1:1] +brakePedalState = bits, U32, 1000, [2:2] +startStopState = bits, U32, 1000, [3:3] +startStopStateToggleCounter = scalar, U32, 1004, "", 1, 0 +egtValue1 = scalar, F32, 1008, "", 1, 0 +egtValue2 = scalar, F32, 1012, "", 1, 0 +desiredRpmLimit = scalar, S16, 1016, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1020, "", 1, 0 +sparkCounter = scalar, U32, 1024, "", 1, 0 +fuelingLoad = scalar, F32, 1028, "", 1, 0 +ignitionLoad = scalar, F32, 1032, "", 1, 0 +veTableYAxis = scalar, U16, 1036, "%", 0.01, 0 +; total TS size = 1040 +tpsFrom = scalar, F32, 1040 +tpsTo = scalar, F32, 1044 +deltaTps = scalar, F32, 1048 +extraFuel = scalar, F32, 1052, "", 1, 0 +valueFromTable = scalar, F32, 1056, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1060, [0:0] +isBelowDecelThreshold = bits, U32, 1060, [1:1] +isTimeToResetAccumulator = bits, U32, 1060, [2:2] +isFractionalEnrichment = bits, U32, 1060, [3:3] +belowEpsilon = bits, U32, 1060, [4:4] +tooShort = bits, U32, 1060, [5:5] +fractionalInjFuel = scalar, F32, 1064, "", 1, 0 +accumulatedValue = scalar, F32, 1068, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1072, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1076, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1080, "", 1, 0 +cycleCnt = scalar, S32, 1084, "", 1, 0 +; total TS size = 1088 +hwEventCounters1 = scalar, U32, 1088, "", 1, 0 +hwEventCounters2 = scalar, U32, 1092, "", 1, 0 +hwEventCounters3 = scalar, U32, 1096, "", 1, 0 +hwEventCounters4 = scalar, U32, 1100, "", 1, 0 +hwEventCounters5 = scalar, U32, 1104, "", 1, 0 +hwEventCounters6 = scalar, U32, 1108, "", 1, 0 +vvtCamCounter = scalar, U32, 1112, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1116, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1120, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1124, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1125, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1128, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1132, "deg", 1, 0 +; total TS size = 1136 +crankSynchronizationCounter = scalar, U32, 1136, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1140, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1144, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1148, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1152, "", 1, 0 +triggerStateIndex = scalar, U08, 1156, "", 1, 0 +vvtCounter = scalar, U08, 1157, "", 1, 0 +camResyncCounter = scalar, U08, 1158, "", 1, 0 +vvtStateIndex = scalar, U08, 1159, "", 1, 0 ; total TS size = 1160 -wallFuelCorrection = scalar, F32, 1160, "", 1, 0 -wallFuel = scalar, F32, 1164, "", 1, 0 -; total TS size = 1168 -idleState = bits, S32, 1168, [0:2], "not important" -currentIdlePosition = scalar, F32, 1172 -baseIdlePosition = scalar, F32, 1176 -iacByTpsTaper = scalar, F32, 1180 -throttlePedalUpState = scalar, S32, 1184, "", 1, 0 -mightResetPid = bits, U32, 1188, [0:0] -shouldResetPid = bits, U32, 1188, [1:1] -wasResetPid = bits, U32, 1188, [2:2] -mustResetPid = bits, U32, 1188, [3:3] -isCranking = bits, U32, 1188, [4:4] -isIacTableForCoasting = bits, U32, 1188, [5:5] -notIdling = bits, U32, 1188, [6:6] -needReset = bits, U32, 1188, [7:7] -isInDeadZone = bits, U32, 1188, [8:8] -isBlipping = bits, U32, 1188, [9:9] -useClosedLoop = bits, U32, 1188, [10:10] -badTps = bits, U32, 1188, [11:11] -looksLikeRunning = bits, U32, 1188, [12:12] -looksLikeCoasting = bits, U32, 1188, [13:13] -looksLikeCrankToIdle = bits, U32, 1188, [14:14] -isVerboseIAC = bits, U32, 1188, [15:15] -isIdleCoasting = bits, U32, 1188, [16:16] -targetRpmByClt = scalar, S32, 1192, "", 1, 0 -targetRpmAcBump = scalar, S32, 1196, "", 1, 0 -iacByRpmTaper = scalar, F32, 1200 -luaAdd = scalar, F32, 1204 -; total TS size = 1208 -baseDwell = scalar, F32, 1208, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1212, "", 1, 0 -luaTimingAdd = scalar, F32, 1216, "", 1, 0 -luaTimingMult = scalar, F32, 1220, "", 1, 0 -; total TS size = 1224 -idlePosition = scalar, F32, 1224, "", 1, 0 -trim = scalar, F32, 1228, "", 1, 0 -luaAdjustment = scalar, F32, 1232, "", 1, 0 -etbFeedForward = scalar, F32, 1236 -etbIntegralError = scalar, F32, 1240, "", 1, 0 -etbCurrentTarget = scalar, F32, 1244, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1248, "%", 1, 0 -etbRevLimitActive = bits, U32, 1252, [0:0] -etbDutyRateOfChange = scalar, F32, 1256, "", 1, 0 -etbDutyAverage = scalar, F32, 1260, "", 1, 0 -etbTpsErrorCounter = scalar, U16, 1264, "", 1, 0 -etbPpsErrorCounter = scalar, U16, 1266, "", 1, 0 -etbErrorCode = scalar, S08, 1268, "", 1, 0 -; total TS size = 1272 -faultCode = scalar, U08, 1272, "", 1, 0 -heaterDuty = scalar, U08, 1273, "%", 1, 0 -pumpDuty = scalar, U08, 1274, "%", 1, 0 -tempC = scalar, U16, 1276, "C", 1, 0 -nernstVoltage = scalar, U16, 1278, "V", 0.001, 0 -esr = scalar, U16, 1280, "", 1, 0 -; total TS size = 1284 +m_hasSynchronizedPhase = bits, U32, 1160, [0:0] +; total TS size = 1164 +wallFuelCorrection = scalar, F32, 1164, "", 1, 0 +wallFuel = scalar, F32, 1168, "", 1, 0 +; total TS size = 1172 +idleState = bits, S32, 1172, [0:2], "not important" +currentIdlePosition = scalar, F32, 1176 +baseIdlePosition = scalar, F32, 1180 +iacByTpsTaper = scalar, F32, 1184 +throttlePedalUpState = scalar, S32, 1188, "", 1, 0 +mightResetPid = bits, U32, 1192, [0:0] +shouldResetPid = bits, U32, 1192, [1:1] +wasResetPid = bits, U32, 1192, [2:2] +mustResetPid = bits, U32, 1192, [3:3] +isCranking = bits, U32, 1192, [4:4] +isIacTableForCoasting = bits, U32, 1192, [5:5] +notIdling = bits, U32, 1192, [6:6] +needReset = bits, U32, 1192, [7:7] +isInDeadZone = bits, U32, 1192, [8:8] +isBlipping = bits, U32, 1192, [9:9] +useClosedLoop = bits, U32, 1192, [10:10] +badTps = bits, U32, 1192, [11:11] +looksLikeRunning = bits, U32, 1192, [12:12] +looksLikeCoasting = bits, U32, 1192, [13:13] +looksLikeCrankToIdle = bits, U32, 1192, [14:14] +isVerboseIAC = bits, U32, 1192, [15:15] +isIdleCoasting = bits, U32, 1192, [16:16] +targetRpmByClt = scalar, S32, 1196, "", 1, 0 +targetRpmAcBump = scalar, S32, 1200, "", 1, 0 +iacByRpmTaper = scalar, F32, 1204 +luaAdd = scalar, F32, 1208 +; total TS size = 1212 +baseDwell = scalar, F32, 1212, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1216, "", 1, 0 +luaTimingAdd = scalar, F32, 1220, "", 1, 0 +luaTimingMult = scalar, F32, 1224, "", 1, 0 +; total TS size = 1228 +idlePosition = scalar, F32, 1228, "", 1, 0 +trim = scalar, F32, 1232, "", 1, 0 +luaAdjustment = scalar, F32, 1236, "", 1, 0 +etbFeedForward = scalar, F32, 1240 +etbIntegralError = scalar, F32, 1244, "", 1, 0 +etbCurrentTarget = scalar, F32, 1248, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1252, "%", 1, 0 +etbRevLimitActive = bits, U32, 1256, [0:0] +etbDutyRateOfChange = scalar, F32, 1260, "", 1, 0 +etbDutyAverage = scalar, F32, 1264, "", 1, 0 +etbTpsErrorCounter = scalar, U16, 1268, "", 1, 0 +etbPpsErrorCounter = scalar, U16, 1270, "", 1, 0 +etbErrorCode = scalar, S08, 1272, "", 1, 0 +; total TS size = 1276 +faultCode = scalar, U08, 1276, "", 1, 0 +heaterDuty = scalar, U08, 1277, "%", 1, 0 +pumpDuty = scalar, U08, 1278, "%", 1, 0 +tempC = scalar, U16, 1280, "C", 1, 0 +nernstVoltage = scalar, U16, 1282, "V", 0.001, 0 +esr = scalar, U16, 1284, "", 1, 0 +; total TS size = 1288 time = { timeNow } @@ -4616,6 +4617,7 @@ entry = AntilagcombinedConditions, "AntilagcombinedConditions", int, "%d" entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" @@ -5380,6 +5382,8 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel + liveGraph = antilag_system_state_1_Graph, "Graph", South + graphLine = fuelALSCorrection indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" 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 47374bfb4b..9905209f66 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 Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -400,17 +400,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(856); - public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(856); - public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(856); - public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(856); - public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(856); - public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(856); - public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(856); - public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(856); - public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(856); - public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(856); - public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(856); + public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(860); + public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(860); + public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(860); + public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(860); + public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(860); + public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(860); + public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(860); + public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(860); + public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(860); + public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(860); + public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(860); 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 1b50a7c7a0..17897788a0 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 Dec 17 01:28:44 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -16,6 +16,7 @@ public class AntilagSystem { public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 7).setBaseOffset(828); public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 8).setBaseOffset(828); public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 9).setBaseOffset(828); + public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(828); public static final Field[] VALUES = { ISANTILAGCONDITION, ALSMINRPMCONDITION, @@ -27,5 +28,6 @@ public class AntilagSystem { ISALSSWITCHACTIVATED, ALSACTIVATEPINSTATE, ALSSWITCHCONDITION, + FUELALSCORRECTION, }; } 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 bc890260a4..112eba783e 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 Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -400,18 +400,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(832); - public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(832); - public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(832); - public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(832); - public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(832); - public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(832); - public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(832); - public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(832); - public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(832); - public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(832); - public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(832); - public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(832); + public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(836); + public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(836); + public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(836); + public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(836); + public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(836); + public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(836); + public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(836); + public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(836); + public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(836); + public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(836); + public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(836); + public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(836); public static final Field[] VALUES = { ISTPSINVALID, M_SHOULDRESETPID, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index 4079a06b30..92dce329a0 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,25 +1,25 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Dec 21 23:51:26 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class ElectronicThrottle { - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1224); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1224); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1224); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 12, FieldType.FLOAT).setBaseOffset(1224); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 16, FieldType.FLOAT).setBaseOffset(1224); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 20, FieldType.FLOAT).setBaseOffset(1224); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 24, FieldType.FLOAT).setBaseOffset(1224); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0).setBaseOffset(1224); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 32, FieldType.FLOAT).setBaseOffset(1224); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 36, FieldType.FLOAT).setBaseOffset(1224); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 40, FieldType.INT16).setScale(1.0).setBaseOffset(1224); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 42, FieldType.INT16).setScale(1.0).setBaseOffset(1224); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 44, FieldType.INT8).setScale(1.0).setBaseOffset(1224); - public static final Field ALIGNMENTFILL_AT_45 = Field.create("ALIGNMENTFILL_AT_45", 45, FieldType.INT8).setScale(1.0).setBaseOffset(1224); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1228); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1228); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1228); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 12, FieldType.FLOAT).setBaseOffset(1228); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 16, FieldType.FLOAT).setBaseOffset(1228); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 20, FieldType.FLOAT).setBaseOffset(1228); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 24, FieldType.FLOAT).setBaseOffset(1228); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0).setBaseOffset(1228); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 32, FieldType.FLOAT).setBaseOffset(1228); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 36, FieldType.FLOAT).setBaseOffset(1228); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 40, FieldType.INT16).setScale(1.0).setBaseOffset(1228); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 42, FieldType.INT16).setScale(1.0).setBaseOffset(1228); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 44, FieldType.INT8).setScale(1.0).setBaseOffset(1228); + public static final Field ALIGNMENTFILL_AT_45 = Field.create("ALIGNMENTFILL_AT_45", 45, FieldType.INT8).setScale(1.0).setBaseOffset(1228); public static final Field[] VALUES = { IDLEPOSITION, TRIM, 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 2e6d76813a..a5ade7a6aa 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 Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -400,55 +400,55 @@ 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(880); - public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(880); - public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(880); - public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(880); - public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(880); - public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(880); - public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(880); - public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(880); - public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(880); - public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(880); - public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(880); - public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(880); - public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(880); - public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(880); - public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(880); - public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(880); - public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(880); - public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(880); - public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(880); - public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(880); - public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(880); - public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(880); - public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 76, FieldType.FLOAT).setBaseOffset(880); - public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 80, FieldType.FLOAT).setBaseOffset(880); - public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 84, FieldType.FLOAT).setBaseOffset(880); - public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 88, FieldType.FLOAT).setBaseOffset(880); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 92, FieldType.FLOAT).setBaseOffset(880); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 96, FieldType.FLOAT).setBaseOffset(880); - public static final Field SPARKDWELL = Field.create("SPARKDWELL", 100, FieldType.FLOAT).setBaseOffset(880); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 104, FieldType.FLOAT).setBaseOffset(880); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 108, FieldType.INT16).setScale(0.01).setBaseOffset(880); - public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 110, FieldType.INT16).setScale(0.01).setBaseOffset(880); - public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 112, FieldType.INT16).setScale(0.01).setBaseOffset(880); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 114, FieldType.INT16).setScale(1.0).setBaseOffset(880); - public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 116, FieldType.BIT, 0).setBaseOffset(880); - public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 116, FieldType.BIT, 1).setBaseOffset(880); - public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 116, FieldType.BIT, 2).setBaseOffset(880); - public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 116, FieldType.BIT, 3).setBaseOffset(880); - public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 120, FieldType.INT).setScale(1.0).setBaseOffset(880); - public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 124, FieldType.FLOAT).setBaseOffset(880); - public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 128, FieldType.FLOAT).setBaseOffset(880); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 132, FieldType.INT16).setScale(1.0).setBaseOffset(880); - public static final Field ALIGNMENTFILL_AT_134 = Field.create("ALIGNMENTFILL_AT_134", 134, FieldType.INT8).setScale(1.0).setBaseOffset(880); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 136, FieldType.INT).setScale(1.0).setBaseOffset(880); - public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 140, FieldType.INT).setScale(1.0).setBaseOffset(880); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 144, FieldType.FLOAT).setBaseOffset(880); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 148, FieldType.FLOAT).setBaseOffset(880); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 152, FieldType.INT16).setScale(0.01).setBaseOffset(880); - public static final Field ALIGNMENTFILL_AT_154 = Field.create("ALIGNMENTFILL_AT_154", 154, FieldType.INT8).setScale(1.0).setBaseOffset(880); + public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(884); + public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(884); + public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(884); + public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(884); + public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(884); + public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(884); + public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(884); + public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(884); + public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(884); + public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(884); + public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(884); + public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(884); + public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(884); + public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(884); + public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(884); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(884); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(884); + public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(884); + public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(884); + public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(884); + public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(884); + public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(884); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 76, FieldType.FLOAT).setBaseOffset(884); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 80, FieldType.FLOAT).setBaseOffset(884); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 84, FieldType.FLOAT).setBaseOffset(884); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 88, FieldType.FLOAT).setBaseOffset(884); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 92, FieldType.FLOAT).setBaseOffset(884); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 96, FieldType.FLOAT).setBaseOffset(884); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 100, FieldType.FLOAT).setBaseOffset(884); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 104, FieldType.FLOAT).setBaseOffset(884); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 108, FieldType.INT16).setScale(0.01).setBaseOffset(884); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 110, FieldType.INT16).setScale(0.01).setBaseOffset(884); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 112, FieldType.INT16).setScale(0.01).setBaseOffset(884); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 114, FieldType.INT16).setScale(1.0).setBaseOffset(884); + public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 116, FieldType.BIT, 0).setBaseOffset(884); + public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 116, FieldType.BIT, 1).setBaseOffset(884); + public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 116, FieldType.BIT, 2).setBaseOffset(884); + public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 116, FieldType.BIT, 3).setBaseOffset(884); + public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 120, FieldType.INT).setScale(1.0).setBaseOffset(884); + public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 124, FieldType.FLOAT).setBaseOffset(884); + public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 128, FieldType.FLOAT).setBaseOffset(884); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 132, FieldType.INT16).setScale(1.0).setBaseOffset(884); + public static final Field ALIGNMENTFILL_AT_134 = Field.create("ALIGNMENTFILL_AT_134", 134, FieldType.INT8).setScale(1.0).setBaseOffset(884); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 136, FieldType.INT).setScale(1.0).setBaseOffset(884); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 140, FieldType.INT).setScale(1.0).setBaseOffset(884); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 144, FieldType.FLOAT).setBaseOffset(884); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 148, FieldType.FLOAT).setBaseOffset(884); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 152, FieldType.INT16).setScale(0.01).setBaseOffset(884); + public static final Field ALIGNMENTFILL_AT_154 = Field.create("ALIGNMENTFILL_AT_154", 154, FieldType.INT8).setScale(1.0).setBaseOffset(884); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, 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 dd752e3468..cdf9447561 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 Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Wed Dec 21 23:51:25 UTC 2022 // 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(868); - public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(868); - public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(868); - public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(868); - public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(868); - public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(868); - public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(868); + public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(872); + public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(872); + public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(872); + public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(872); + public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(872); + public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(872); + public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(872); public static final Field[] VALUES = { CRANKING, NOTRUNNING, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 7459cf27f6..8d79f0e5f0 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:33:29 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 21 23:52:07 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1182,10 +1182,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.12.21.all.snap_31565"; + public static final String TS_SIGNATURE = "rusEFI 2022.12.21.all.snap_14182"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1284; + public static final int TS_TOTAL_OUTPUT_SIZE = 1288; public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; public static final int TS_TRIGGER_SCOPE_DISABLE = 5; 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 071a6c7ba2..42f313073c 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 Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Wed Dec 21 23:51:25 UTC 2022 // 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(872); - public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(872); - public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(872); - public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(872); + public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(876); + public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(876); + public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(876); + public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(876); public static final Field[] VALUES = { ISPRIME, ENGINETURNEDRECENTLY, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index 32c9d67a75..492285d06d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,37 +1,37 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IdleState { - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1168); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1168); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1168); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1168); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1168); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1168); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1168); - public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1168); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1168); - public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1168); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1168); - public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1168); - public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1168); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1168); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1168); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1168); - public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1168); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1168); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1168); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1168); - public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 15).setBaseOffset(1168); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 16).setBaseOffset(1168); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1168); - public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1168); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1168); - public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1168); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1172); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1172); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1172); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1172); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1172); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1172); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1172); + public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1172); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1172); + public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1172); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1172); + public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1172); + public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1172); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1172); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1172); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1172); + public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1172); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1172); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1172); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1172); + public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 15).setBaseOffset(1172); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 16).setBaseOffset(1172); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1172); + public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1172); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1172); + public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1172); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java index d8dffaae75..478b63ad4c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.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/algo/ignition_state.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IgnitionState { - public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT).setBaseOffset(1208); - public static final Field DWELLVOLTAGECORRECTION = Field.create("DWELLVOLTAGECORRECTION", 4, FieldType.FLOAT).setBaseOffset(1208); - public static final Field LUATIMINGADD = Field.create("LUATIMINGADD", 8, FieldType.FLOAT).setBaseOffset(1208); - public static final Field LUATIMINGMULT = Field.create("LUATIMINGMULT", 12, FieldType.FLOAT).setBaseOffset(1208); + public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT).setBaseOffset(1212); + public static final Field DWELLVOLTAGECORRECTION = Field.create("DWELLVOLTAGECORRECTION", 4, FieldType.FLOAT).setBaseOffset(1212); + public static final Field LUATIMINGADD = Field.create("LUATIMINGADD", 8, FieldType.FLOAT).setBaseOffset(1212); + public static final Field LUATIMINGMULT = Field.create("LUATIMINGMULT", 12, FieldType.FLOAT).setBaseOffset(1212); public static final Field[] VALUES = { BASEDWELL, DWELLVOLTAGECORRECTION, 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 58fe04842d..b99deb0120 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 Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Wed Dec 21 23:51:25 UTC 2022 // 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(876); - public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(876); - public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(876); - public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(876); + public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(880); + public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(880); + public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(880); + public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(880); public static final Field[] VALUES = { ISBENCHTEST, HASIGNITIONVOLTAGE, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java index 5c5346335d..c347c07fbf 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java @@ -1,28 +1,28 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/tps_accel_state.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/tps_accel_state.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TpsAccelState { - public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1036); - public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1036); - public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1036); - public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1036); - public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1036); - public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1036); - public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1036); - public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1036); - public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1036); - public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1036); - public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1036); - public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1036); - public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1036); - public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1036); - public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1036); - public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1036); - public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1036); + public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1040); + public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1040); + public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1040); + public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1040); + public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1040); + public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1040); + public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1040); + public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1040); + public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1040); + public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1040); + public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1040); + public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1040); + public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1040); + public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1040); + public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1040); + public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1040); + public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1040); public static final Field[] VALUES = { TPSFROM, TPSTO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index f4595c7701..4d92c67a0a 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,26 +1,26 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerCentral { public static final int HW_EVENT_TYPES = 6; - public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1084); - public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1084); - public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1084); - public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1084); - public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1084); - public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1084); - public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1084); - public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1084); - public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1084); - public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1084); - public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1084); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1084); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1084); - public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1084); + public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1088); + public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1088); + public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1088); + public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1088); + public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1088); + public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1088); + public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1088); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1088); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1088); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1088); + public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1088); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1088); + public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1088); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1088); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 392dcfc73e..86045ddd68 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.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/trigger/trigger_state.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -400,15 +400,15 @@ public class TriggerState { 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 CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1132); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1132); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 8, FieldType.FLOAT).setBaseOffset(1132); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 12, FieldType.FLOAT).setBaseOffset(1132); - public static final Field TRIGGERACTUALSYNCGAPRATIO = Field.create("TRIGGERACTUALSYNCGAPRATIO", 16, FieldType.FLOAT).setBaseOffset(1132); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 20, FieldType.INT8).setScale(1.0).setBaseOffset(1132); - public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 21, FieldType.INT8).setScale(1.0).setBaseOffset(1132); - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 22, FieldType.INT8).setScale(1.0).setBaseOffset(1132); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 23, FieldType.INT8).setScale(1.0).setBaseOffset(1132); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1136); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1136); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 8, FieldType.FLOAT).setBaseOffset(1136); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 12, FieldType.FLOAT).setBaseOffset(1136); + public static final Field TRIGGERACTUALSYNCGAPRATIO = Field.create("TRIGGERACTUALSYNCGAPRATIO", 16, FieldType.FLOAT).setBaseOffset(1136); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 20, FieldType.INT8).setScale(1.0).setBaseOffset(1136); + public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 21, FieldType.INT8).setScale(1.0).setBaseOffset(1136); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 22, FieldType.INT8).setScale(1.0).setBaseOffset(1136); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 23, FieldType.INT8).setScale(1.0).setBaseOffset(1136); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 4d4978730f..bed96b48d1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.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/trigger/trigger_state_primary.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -400,7 +400,7 @@ public class TriggerStatePrimary { 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 M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1156); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1160); public static final Field[] VALUES = { M_HASSYNCHRONIZEDPHASE, }; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index 89e30fbdf9..0f4344a644 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,13 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Wed Dec 21 23:51:25 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1160); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1160); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1164); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1164); public static final Field[] VALUES = { WALLFUELCORRECTION, WALLFUEL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index 32825d9cab..e8875001f5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Mon Dec 19 16:58:02 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Wed Dec 21 23:51:26 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1272); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1272); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1272); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1272); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1272); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1272); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1272); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1272); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1276); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1276); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1276); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1276); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1276); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1276); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1276); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1276); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,