diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 3b62f34105..5b944a9b08 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1937,7 +1937,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2637454054 +#define SIGNATURE_HASH 2589564671 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2489,12 +2489,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen_cypress.2637454054" +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen_cypress.2589564671" #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 1012 +#define TS_TOTAL_OUTPUT_SIZE 1016 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 2e4c4f1a58..d476251eac 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1923,7 +1923,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3279371627 +#define SIGNATURE_HASH 3290102130 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2475,12 +2475,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.30.kin.3279371627" +#define TS_SIGNATURE "rusEFI 2022.06.30.kin.3290102130" #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 1012 +#define TS_TOTAL_OUTPUT_SIZE 1016 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index a70de85f90..f4ca9b5bfe 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1903,7 +1903,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3540643166 +#define SIGNATURE_HASH 3563333959 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2456,12 +2456,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.30.subaru_eg33_f7.3540643166" +#define TS_SIGNATURE "rusEFI 2022.06.30.subaru_eg33_f7.3563333959" #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 1012 +#define TS_TOTAL_OUTPUT_SIZE 1016 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index b126c424be..050fb144ad 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -313,6 +313,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 7d59af250c..3d80c13486 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -119,45 +119,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 8d35f2e1f6..09c9bd0ba4 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -404,129 +404,130 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 0eea8b754f..a555ad3c18 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -307,80 +307,80 @@ boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16 latest_usage_ac_control("latest_usage_ac_control", SensorCategory.SENSOR_INPUTS, FieldType.INT, 652, 1.0, -1.0, -1.0, ""), acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 656, 1.0, -1.0, -1.0, ""), lua("lua", SensorCategory.SENSOR_INPUTS, FieldType.INT, 672, 1.0, -1.0, -1.0, ""), -sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 680, 1.0, -1.0, -1.0, ""), -targetAFR("targetAFR", SensorCategory.SENSOR_INPUTS, FieldType.INT, 704, 1.0, -1.0, -1.0, ""), -engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 708, 1.0, -1.0, -1.0, ""), -minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 712, 1.0, -1.0, -1.0, ""), -currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 716, 1.0, -1.0, -1.0, ""), -tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 720, 1.0, -1.0, -1.0, ""), -tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 724, 1.0, -1.0, -1.0, ""), -currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 728, 1.0, -1.0, -1.0, ""), -injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 732, 1.0, -1.0, -1.0, ""), -baroCorrection("baroCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 736, 1.0, -1.0, -1.0, ""), -cranking("cranking", SensorCategory.SENSOR_INPUTS, FieldType.INT, 740, 1.0, -1.0, -1.0, ""), -running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 760, 1.0, -1.0, -1.0, ""), -sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 788, 1.0, -1.0, -1.0, ""), -dwellAngle("ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 792, 1.0, -1.0, -1.0, ""), -cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 796, 0.01, -20.0, 20.0, "deg"), -timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 798, 0.01, -20.0, 20.0, "deg"), -timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 800, 0.01, -20.0, 20.0, "deg"), -hellenBoardId("Detected Board ID", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 802, 1.0, 0.0, 3000.0, "id"), -tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 808, 1.0, -1.0, -1.0, ""), -tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 812, 1.0, -1.0, -1.0, ""), -deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 816, 1.0, -1.0, -1.0, ""), -extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 820, 1.0, -1.0, -1.0, ""), -valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 824, 1.0, -1.0, -1.0, ""), -fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 832, 1.0, -1.0, -1.0, ""), -accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), -maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), -maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), -maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), -cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 852, 1.0, -1.0, -1.0, ""), -hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 856, 1.0, -1.0, -1.0, ""), -hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), -hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 864, 1.0, -1.0, -1.0, ""), -hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 868, 1.0, -1.0, -1.0, ""), -hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 872, 1.0, -1.0, -1.0, ""), -hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 876, 1.0, -1.0, -1.0, ""), -vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 880, 1.0, -1.0, -1.0, ""), -mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 884, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 888, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 892, 1.0, -10000.0, 10000.0, ""), -mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 893, 1.0, -10000.0, 10000.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 894, 1.0, -20.0, 100.0, "units"), -totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 896, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 900, 1.0, -10000.0, 10000.0, ""), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -10000.0, 10000.0, ""), -triggerActualSyncGapRatio("triggerActualSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -1.0, -1.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 916, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 917, 1.0, -1.0, -1.0, ""), -vvtSyncCounter("vvtSyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 918, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 919, 1.0, -1.0, -1.0, ""), -wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 920, 1.0, -1.0, -1.0, ""), -wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), -currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -1.0, -1.0, ""), -baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), -targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 952, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1000, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1001, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1002, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1003, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1004, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1006, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1008, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1010, 1.0, -20.0, 100.0, "units"), +sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 684, 1.0, -1.0, -1.0, ""), +targetAFR("targetAFR", SensorCategory.SENSOR_INPUTS, FieldType.INT, 708, 1.0, -1.0, -1.0, ""), +engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 712, 1.0, -1.0, -1.0, ""), +minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 716, 1.0, -1.0, -1.0, ""), +currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 720, 1.0, -1.0, -1.0, ""), +tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 724, 1.0, -1.0, -1.0, ""), +tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 728, 1.0, -1.0, -1.0, ""), +currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 732, 1.0, -1.0, -1.0, ""), +injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 736, 1.0, -1.0, -1.0, ""), +baroCorrection("baroCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 740, 1.0, -1.0, -1.0, ""), +cranking("cranking", SensorCategory.SENSOR_INPUTS, FieldType.INT, 744, 1.0, -1.0, -1.0, ""), +running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 764, 1.0, -1.0, -1.0, ""), +sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 792, 1.0, -1.0, -1.0, ""), +dwellAngle("ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 796, 1.0, -1.0, -1.0, ""), +cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 800, 0.01, -20.0, 20.0, "deg"), +timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 802, 0.01, -20.0, 20.0, "deg"), +timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 804, 0.01, -20.0, 20.0, "deg"), +hellenBoardId("Detected Board ID", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 806, 1.0, 0.0, 3000.0, "id"), +tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 812, 1.0, -1.0, -1.0, ""), +tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 816, 1.0, -1.0, -1.0, ""), +deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 820, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 824, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 828, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 852, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 856, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 864, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 868, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 872, 1.0, -1.0, -1.0, ""), +hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 876, 1.0, -1.0, -1.0, ""), +hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 880, 1.0, -1.0, -1.0, ""), +vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 884, 1.0, -1.0, -1.0, ""), +mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 888, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 892, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 896, 1.0, -10000.0, 10000.0, ""), +mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 897, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 898, 1.0, -20.0, 100.0, "units"), +totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 900, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -10000.0, 10000.0, ""), +triggerActualSyncGapRatio("triggerActualSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -1.0, -1.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 920, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 921, 1.0, -1.0, -1.0, ""), +vvtSyncCounter("vvtSyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 922, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 923, 1.0, -1.0, -1.0, ""), +wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), +wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -1.0, -1.0, ""), +currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), +baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), +targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1004, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1005, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1006, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1007, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1008, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1010, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1012, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1014, 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 d601e0eb7b..52d5866b97 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / UsagesReader.java -#define TS_TOTAL_OUTPUT_SIZE 1012 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1016 \ No newline at end of file diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index 95dddb706d..55be3e96f4 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 22:14:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Jun 30 17:52:53 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -10,103 +10,107 @@ struct LuaAdjustments { */ float fuelAdd = (float)0; /** - offset 4 bit 0 */ + * offset 4 + */ + float fuelMult = (float)0; + /** + offset 8 bit 0 */ bool clutchUpState : 1 {}; /** - offset 4 bit 1 */ + offset 8 bit 1 */ bool brakePedalState : 1 {}; /** - offset 4 bit 2 */ - bool unusedBit_3_2 : 1 {}; + offset 8 bit 2 */ + bool unusedBit_4_2 : 1 {}; /** - offset 4 bit 3 */ - bool unusedBit_3_3 : 1 {}; + offset 8 bit 3 */ + bool unusedBit_4_3 : 1 {}; /** - offset 4 bit 4 */ - bool unusedBit_3_4 : 1 {}; + offset 8 bit 4 */ + bool unusedBit_4_4 : 1 {}; /** - offset 4 bit 5 */ - bool unusedBit_3_5 : 1 {}; + offset 8 bit 5 */ + bool unusedBit_4_5 : 1 {}; /** - offset 4 bit 6 */ - bool unusedBit_3_6 : 1 {}; + offset 8 bit 6 */ + bool unusedBit_4_6 : 1 {}; /** - offset 4 bit 7 */ - bool unusedBit_3_7 : 1 {}; + offset 8 bit 7 */ + bool unusedBit_4_7 : 1 {}; /** - offset 4 bit 8 */ - bool unusedBit_3_8 : 1 {}; + offset 8 bit 8 */ + bool unusedBit_4_8 : 1 {}; /** - offset 4 bit 9 */ - bool unusedBit_3_9 : 1 {}; + offset 8 bit 9 */ + bool unusedBit_4_9 : 1 {}; /** - offset 4 bit 10 */ - bool unusedBit_3_10 : 1 {}; + offset 8 bit 10 */ + bool unusedBit_4_10 : 1 {}; /** - offset 4 bit 11 */ - bool unusedBit_3_11 : 1 {}; + offset 8 bit 11 */ + bool unusedBit_4_11 : 1 {}; /** - offset 4 bit 12 */ - bool unusedBit_3_12 : 1 {}; + offset 8 bit 12 */ + bool unusedBit_4_12 : 1 {}; /** - offset 4 bit 13 */ - bool unusedBit_3_13 : 1 {}; + offset 8 bit 13 */ + bool unusedBit_4_13 : 1 {}; /** - offset 4 bit 14 */ - bool unusedBit_3_14 : 1 {}; + offset 8 bit 14 */ + bool unusedBit_4_14 : 1 {}; /** - offset 4 bit 15 */ - bool unusedBit_3_15 : 1 {}; + offset 8 bit 15 */ + bool unusedBit_4_15 : 1 {}; /** - offset 4 bit 16 */ - bool unusedBit_3_16 : 1 {}; + offset 8 bit 16 */ + bool unusedBit_4_16 : 1 {}; /** - offset 4 bit 17 */ - bool unusedBit_3_17 : 1 {}; + offset 8 bit 17 */ + bool unusedBit_4_17 : 1 {}; /** - offset 4 bit 18 */ - bool unusedBit_3_18 : 1 {}; + offset 8 bit 18 */ + bool unusedBit_4_18 : 1 {}; /** - offset 4 bit 19 */ - bool unusedBit_3_19 : 1 {}; + offset 8 bit 19 */ + bool unusedBit_4_19 : 1 {}; /** - offset 4 bit 20 */ - bool unusedBit_3_20 : 1 {}; + offset 8 bit 20 */ + bool unusedBit_4_20 : 1 {}; /** - offset 4 bit 21 */ - bool unusedBit_3_21 : 1 {}; + offset 8 bit 21 */ + bool unusedBit_4_21 : 1 {}; /** - offset 4 bit 22 */ - bool unusedBit_3_22 : 1 {}; + offset 8 bit 22 */ + bool unusedBit_4_22 : 1 {}; /** - offset 4 bit 23 */ - bool unusedBit_3_23 : 1 {}; + offset 8 bit 23 */ + bool unusedBit_4_23 : 1 {}; /** - offset 4 bit 24 */ - bool unusedBit_3_24 : 1 {}; + offset 8 bit 24 */ + bool unusedBit_4_24 : 1 {}; /** - offset 4 bit 25 */ - bool unusedBit_3_25 : 1 {}; + offset 8 bit 25 */ + bool unusedBit_4_25 : 1 {}; /** - offset 4 bit 26 */ - bool unusedBit_3_26 : 1 {}; + offset 8 bit 26 */ + bool unusedBit_4_26 : 1 {}; /** - offset 4 bit 27 */ - bool unusedBit_3_27 : 1 {}; + offset 8 bit 27 */ + bool unusedBit_4_27 : 1 {}; /** - offset 4 bit 28 */ - bool unusedBit_3_28 : 1 {}; + offset 8 bit 28 */ + bool unusedBit_4_28 : 1 {}; /** - offset 4 bit 29 */ - bool unusedBit_3_29 : 1 {}; + offset 8 bit 29 */ + bool unusedBit_4_29 : 1 {}; /** - offset 4 bit 30 */ - bool unusedBit_3_30 : 1 {}; + offset 8 bit 30 */ + bool unusedBit_4_30 : 1 {}; /** - offset 4 bit 31 */ - bool unusedBit_3_31 : 1 {}; + offset 8 bit 31 */ + bool unusedBit_4_31 : 1 {}; }; -static_assert(sizeof(LuaAdjustments) == 8); +static_assert(sizeof(LuaAdjustments) == 12); // start of speed_density_s struct speed_density_s { @@ -308,189 +312,188 @@ struct engine_state_s { */ LuaAdjustments lua; /** - * offset 8 + * offset 12 */ speed_density_s sd; /** - * offset 32 + * offset 36 */ float targetAFR = (float)0; /** - * offset 36 + * offset 40 */ float engineCycleDurationMs = (float)0; /** - * offset 40 + * offset 44 */ float minRpmKcurrentTPS = (float)0; /** - * offset 44 + * offset 48 */ int currentTpsAdc = (int)0; /** - * offset 48 + * offset 52 */ float tpsVoltageMCU = (float)0; /** - * offset 52 + * offset 56 */ float tpsVoltageBoard = (float)0; /** - * offset 56 + * offset 60 */ float currentBaroCorrectedVE = (float)0; /** - * offset 60 + * offset 64 */ float injectorFlowCorrection = (float)0; /** - * offset 64 + * offset 68 */ float baroCorrection = (float)0; /** - * offset 68 + * offset 72 */ cranking_fuel_s cranking; /** - * offset 88 + * offset 92 */ running_fuel_s running; /** * ignition dwell duration in ms * See also dwellAngle - * offset 116 + * offset 120 */ floatms_t sparkDwell = (floatms_t)0; /** * ignition dwell duration as crankshaft angle * NAN if engine is stopped * See also sparkDwell - * offset 120 + * offset 124 */ angle_t dwellAngle = (angle_t)0; /** deg - * offset 124 + * offset 128 */ scaled_channel cltTimingCorrection = (int16_t)0; /** deg - * offset 126 + * offset 130 */ scaled_channel timingIatCorrection = (int16_t)0; /** deg - * offset 128 + * offset 132 */ scaled_channel timingPidCorrection = (int16_t)0; /** * Detected Board ID id - * offset 130 + * offset 134 */ int16_t hellenBoardId = (int16_t)0; /** * @@INDICATOR_NAME_CLUTCH_UP@@ - offset 132 bit 0 */ + offset 136 bit 0 */ bool clutchUpState : 1 {}; /** * @@INDICATOR_NAME_CLUTCH_DOWN@@ - offset 132 bit 1 */ + offset 136 bit 1 */ bool clutchDownState : 1 {}; /** * @@INDICATOR_NAME_BRAKE_DOWN@@ - offset 132 bit 2 */ + offset 136 bit 2 */ bool brakePedalState : 1 {}; /** - offset 132 bit 3 */ + offset 136 bit 3 */ bool unusedBit_22_3 : 1 {}; /** - offset 132 bit 4 */ + offset 136 bit 4 */ bool unusedBit_22_4 : 1 {}; /** - offset 132 bit 5 */ + offset 136 bit 5 */ bool unusedBit_22_5 : 1 {}; /** - offset 132 bit 6 */ + offset 136 bit 6 */ bool unusedBit_22_6 : 1 {}; /** - offset 132 bit 7 */ + offset 136 bit 7 */ bool unusedBit_22_7 : 1 {}; /** - offset 132 bit 8 */ + offset 136 bit 8 */ bool unusedBit_22_8 : 1 {}; /** - offset 132 bit 9 */ + offset 136 bit 9 */ bool unusedBit_22_9 : 1 {}; /** - offset 132 bit 10 */ + offset 136 bit 10 */ bool unusedBit_22_10 : 1 {}; /** - offset 132 bit 11 */ + offset 136 bit 11 */ bool unusedBit_22_11 : 1 {}; /** - offset 132 bit 12 */ + offset 136 bit 12 */ bool unusedBit_22_12 : 1 {}; /** - offset 132 bit 13 */ + offset 136 bit 13 */ bool unusedBit_22_13 : 1 {}; /** - offset 132 bit 14 */ + offset 136 bit 14 */ bool unusedBit_22_14 : 1 {}; /** - offset 132 bit 15 */ + offset 136 bit 15 */ bool unusedBit_22_15 : 1 {}; /** - offset 132 bit 16 */ + offset 136 bit 16 */ bool unusedBit_22_16 : 1 {}; /** - offset 132 bit 17 */ + offset 136 bit 17 */ bool unusedBit_22_17 : 1 {}; /** - offset 132 bit 18 */ + offset 136 bit 18 */ bool unusedBit_22_18 : 1 {}; /** - offset 132 bit 19 */ + offset 136 bit 19 */ bool unusedBit_22_19 : 1 {}; /** - offset 132 bit 20 */ + offset 136 bit 20 */ bool unusedBit_22_20 : 1 {}; /** - offset 132 bit 21 */ + offset 136 bit 21 */ bool unusedBit_22_21 : 1 {}; /** - offset 132 bit 22 */ + offset 136 bit 22 */ bool unusedBit_22_22 : 1 {}; /** - offset 132 bit 23 */ + offset 136 bit 23 */ bool unusedBit_22_23 : 1 {}; /** - offset 132 bit 24 */ + offset 136 bit 24 */ bool unusedBit_22_24 : 1 {}; /** - offset 132 bit 25 */ + offset 136 bit 25 */ bool unusedBit_22_25 : 1 {}; /** - offset 132 bit 26 */ + offset 136 bit 26 */ bool unusedBit_22_26 : 1 {}; /** - offset 132 bit 27 */ + offset 136 bit 27 */ bool unusedBit_22_27 : 1 {}; /** - offset 132 bit 28 */ + offset 136 bit 28 */ bool unusedBit_22_28 : 1 {}; /** - offset 132 bit 29 */ + offset 136 bit 29 */ bool unusedBit_22_29 : 1 {}; /** - offset 132 bit 30 */ + offset 136 bit 30 */ bool unusedBit_22_30 : 1 {}; /** - offset 132 bit 31 */ + offset 136 bit 31 */ bool unusedBit_22_31 : 1 {}; }; -static_assert(sizeof(engine_state_s) == 136); +static_assert(sizeof(engine_state_s) == 140); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 22:14:57 UTC 2022 -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 22:24:49 EDT 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Jun 30 17:52:53 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 4ac38e91a2..a3dcb0ae37 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1937,7 +1937,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3625456876 +#define SIGNATURE_HASH 3749040373 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2489,12 +2489,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.30.all.3625456876" +#define TS_SIGNATURE "rusEFI 2022.06.30.all.3749040373" #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 1012 +#define TS_TOTAL_OUTPUT_SIZE 1016 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 4c8dc4e62b..0be8ed5d85 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3477019811 -#define TS_SIGNATURE "rusEFI 2022.06.30.48way.3477019811" +#define SIGNATURE_HASH 3360872634 +#define TS_SIGNATURE "rusEFI 2022.06.30.48way.3360872634" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index af662df31c..7443c42326 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3625456876 -#define TS_SIGNATURE "rusEFI 2022.06.30.all.3625456876" +#define SIGNATURE_HASH 3749040373 +#define TS_SIGNATURE "rusEFI 2022.06.30.all.3749040373" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index e682be93ac..74c4f02499 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3926559104 -#define TS_SIGNATURE "rusEFI 2022.06.30.alphax-2chan.3926559104" +#define SIGNATURE_HASH 3982970265 +#define TS_SIGNATURE "rusEFI 2022.06.30.alphax-2chan.3982970265" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 02baf8aa95..946b801e6e 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4220844975 -#define TS_SIGNATURE "rusEFI 2022.06.30.alphax-4chan.4220844975" +#define SIGNATURE_HASH 4244193206 +#define TS_SIGNATURE "rusEFI 2022.06.30.alphax-4chan.4244193206" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index b3536cc708..c1cfeb9376 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3302154699 -#define TS_SIGNATURE "rusEFI 2022.06.30.atlas.3302154699" +#define SIGNATURE_HASH 3284084178 +#define TS_SIGNATURE "rusEFI 2022.06.30.atlas.3284084178" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 59e9eb608a..b9638ed240 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 787760405 -#define TS_SIGNATURE "rusEFI 2022.06.30.core8.787760405" +#define SIGNATURE_HASH 697925900 +#define TS_SIGNATURE "rusEFI 2022.06.30.core8.697925900" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 7ea46e22f8..835d0bc9fd 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3625456876 -#define TS_SIGNATURE "rusEFI 2022.06.30.f407-discovery.3625456876" +#define SIGNATURE_HASH 3749040373 +#define TS_SIGNATURE "rusEFI 2022.06.30.f407-discovery.3749040373" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 05a63a31b0..d6031f3787 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3625456876 -#define TS_SIGNATURE "rusEFI 2022.06.30.f429-discovery.3625456876" +#define SIGNATURE_HASH 3749040373 +#define TS_SIGNATURE "rusEFI 2022.06.30.f429-discovery.3749040373" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b60d4aab9f..12f66f091b 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2591352872 -#define TS_SIGNATURE "rusEFI 2022.06.30.frankenso_na6.2591352872" +#define SIGNATURE_HASH 2635672625 +#define TS_SIGNATURE "rusEFI 2022.06.30.frankenso_na6.2635672625" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 7d6dd7d206..46c68f4c52 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2901691283 -#define TS_SIGNATURE "rusEFI 2022.06.30.harley81.2901691283" +#define SIGNATURE_HASH 2878967690 +#define TS_SIGNATURE "rusEFI 2022.06.30.harley81.2878967690" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index a998ad2fb5..98d0e40b41 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4179035529 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen-gm-e67.4179035529" +#define SIGNATURE_HASH 4269457808 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen-gm-e67.4269457808" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index c38a5e9d19..b37bbd3074 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 26420512 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen-nb1.26420512" +#define SIGNATURE_HASH 117367097 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen-nb1.117367097" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index c8bb3b8fc9..d59189ea9e 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1355197446 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen121nissan.1355197446" +#define SIGNATURE_HASH 1470851103 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen121nissan.1470851103" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 9d026c9c39..1fcc014e84 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2822363030 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen121vag.2822363030" +#define SIGNATURE_HASH 2941522831 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen121vag.2941522831" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index f07fba45a3..9abd2ef65c 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3056846909 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen128.3056846909" +#define SIGNATURE_HASH 2975730724 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen128.2975730724" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index be4dc1a258..114015b296 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1079469672 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen154hyundai.1079469672" +#define SIGNATURE_HASH 1195025009 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen154hyundai.1195025009" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 86062f7e44..6a407a2a47 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 707214824 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen72.707214824" +#define SIGNATURE_HASH 759888369 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen72.759888369" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index e1af764b15..37d58ab0a4 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4205694182 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen81.4205694182" +#define SIGNATURE_HASH 4257220863 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen81.4257220863" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index ac765f5fe0..c81faf41f2 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2224017992 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen88bmw.2224017992" +#define SIGNATURE_HASH 2212632145 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen88bmw.2212632145" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 0bad02d2fc..574535c1e9 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1519641996 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellenNA6.1519641996" +#define SIGNATURE_HASH 1576935829 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellenNA6.1576935829" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index dca13b8870..e31ecb60ce 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3668037340 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellenNA8_96.3668037340" +#define SIGNATURE_HASH 3721136837 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellenNA8_96.3721136837" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 4d766a2caf..99fc76e49e 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 2637454054 -#define TS_SIGNATURE "rusEFI 2022.06.30.hellen_cypress.2637454054" +#define SIGNATURE_HASH 2589564671 +#define TS_SIGNATURE "rusEFI 2022.06.30.hellen_cypress.2589564671" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 1ad6994770..cfe2b57fbb 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 3279371627 -#define TS_SIGNATURE "rusEFI 2022.06.30.kin.3279371627" +#define SIGNATURE_HASH 3290102130 +#define TS_SIGNATURE "rusEFI 2022.06.30.kin.3290102130" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 6d96098d66..8814ebbe58 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 399415322 -#define TS_SIGNATURE "rusEFI 2022.06.30.mre_f4.399415322" +#define SIGNATURE_HASH 279141379 +#define TS_SIGNATURE "rusEFI 2022.06.30.mre_f4.279141379" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 4b469fb2d7..abbb89d939 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 399415322 -#define TS_SIGNATURE "rusEFI 2022.06.30.mre_f7.399415322" +#define SIGNATURE_HASH 279141379 +#define TS_SIGNATURE "rusEFI 2022.06.30.mre_f7.279141379" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index d8aa6b131a..cebd95ad9a 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2297613578 -#define TS_SIGNATURE "rusEFI 2022.06.30.prometheus_405.2297613578" +#define SIGNATURE_HASH 2409564435 +#define TS_SIGNATURE "rusEFI 2022.06.30.prometheus_405.2409564435" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 0c2b1eb9c2..00f3e6fe23 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2297613578 -#define TS_SIGNATURE "rusEFI 2022.06.30.prometheus_469.2297613578" +#define SIGNATURE_HASH 2409564435 +#define TS_SIGNATURE "rusEFI 2022.06.30.prometheus_469.2409564435" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 163151b9fc..20e5382700 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2111165338 -#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_f4.2111165338" +#define SIGNATURE_HASH 2058884995 +#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_f4.2058884995" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index ad18f3590c..62527f9b16 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2111165338 -#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_f7.2111165338" +#define SIGNATURE_HASH 2058884995 +#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_f7.2058884995" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 14cd2bdf74..b9e01c759f 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2111165338 -#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_h7.2111165338" +#define SIGNATURE_HASH 2058884995 +#define TS_SIGNATURE "rusEFI 2022.06.30.proteus_h7.2058884995" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 9f3e0645d1..47347cfc79 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 3540643166 -#define TS_SIGNATURE "rusEFI 2022.06.30.subaru_eg33_f7.3540643166" +#define SIGNATURE_HASH 3563333959 +#define TS_SIGNATURE "rusEFI 2022.06.30.subaru_eg33_f7.3563333959" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 1bfa39ccbd..e883711c4a 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1913707192 -#define TS_SIGNATURE "rusEFI 2022.06.30.tdg-pdm8.1913707192" +#define SIGNATURE_HASH 1971134113 +#define TS_SIGNATURE "rusEFI 2022.06.30.tdg-pdm8.1971134113" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index adb74cc2f2..ed9d7c3c2c 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.all.3625456876" + signature = "rusEFI 2022.06.30.all.3749040373" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.all.3625456876" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.all.3749040373" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:40 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4872,45 +4874,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 6f3c5deee8..8735c309ee 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.48way.3477019811" + signature = "rusEFI 2022.06.30.48way.3360872634" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.48way.3477019811" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.48way.3360872634" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:22 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4869,45 +4871,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 733b94c4c3..e08cd7d230 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.alphax-2chan.3926559104" + signature = "rusEFI 2022.06.30.alphax-2chan.3982970265" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.alphax-2chan.3926559104" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.alphax-2chan.3982970265" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:52:54 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4866,45 +4868,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index b2e37c52d0..3e3c70a296 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.alphax-4chan.4220844975" + signature = "rusEFI 2022.06.30.alphax-4chan.4244193206" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.alphax-4chan.4220844975" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.alphax-4chan.4244193206" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:52:56 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4867,45 +4869,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 017c8fbff4..505abb7a2a 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.atlas.3302154699" + signature = "rusEFI 2022.06.30.atlas.3284084178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.atlas.3302154699" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.atlas.3284084178" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:37 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4872,45 +4874,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 33b54f08f4..f2173aa86a 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.core8.787760405" + signature = "rusEFI 2022.06.30.core8.697925900" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.core8.787760405" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.core8.697925900" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:21 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4869,45 +4871,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index c315d07654..3e97762786 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.f407-discovery.3625456876" + signature = "rusEFI 2022.06.30.f407-discovery.3749040373" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.f407-discovery.3625456876" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.f407-discovery.3749040373" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:33 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4872,45 +4874,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 174c9ce36d..566b7211fd 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.f429-discovery.3625456876" + signature = "rusEFI 2022.06.30.f429-discovery.3749040373" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.f429-discovery.3625456876" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.f429-discovery.3749040373" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:35 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4872,45 +4874,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index fc7b0c3099..4f61f592a5 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.frankenso_na6.2591352872" + signature = "rusEFI 2022.06.30.frankenso_na6.2635672625" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.frankenso_na6.2591352872" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.frankenso_na6.2635672625" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:24 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4872,45 +4874,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 462b0d0f51..e75c153f24 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.harley81.2901691283" + signature = "rusEFI 2022.06.30.harley81.2878967690" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.harley81.2901691283" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.harley81.2878967690" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:52:58 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 52ddb5ffcd..2bba6cb91b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen-gm-e67.4179035529" + signature = "rusEFI 2022.06.30.hellen-gm-e67.4269457808" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen-gm-e67.4179035529" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen-gm-e67.4269457808" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:12 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index c890fe681c..71939983c9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen-nb1.26420512" + signature = "rusEFI 2022.06.30.hellen-nb1.117367097" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen-nb1.26420512" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen-nb1.117367097" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:11 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 1cbef40838..c4c2d5b373 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen121nissan.1355197446" + signature = "rusEFI 2022.06.30.hellen121nissan.1470851103" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen121nissan.1355197446" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen121nissan.1470851103" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:03 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 65987699f4..baa0edff74 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen121vag.2822363030" + signature = "rusEFI 2022.06.30.hellen121vag.2941522831" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen121vag.2822363030" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen121vag.2941522831" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:01 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 32e61afdbb..4c07963749 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen128.3056846909" + signature = "rusEFI 2022.06.30.hellen128.2975730724" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen128.3056846909" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen128.2975730724" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:52:59 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index c2b65d2402..e18a62b4f5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen154hyundai.1079469672" + signature = "rusEFI 2022.06.30.hellen154hyundai.1195025009" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen154hyundai.1079469672" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen154hyundai.1195025009" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:04 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 031dd15d92..17774d9c8a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen72.707214824" + signature = "rusEFI 2022.06.30.hellen72.759888369" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen72.707214824" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen72.759888369" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:08 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 9624aecd4b..71840c0c7e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen81.4205694182" + signature = "rusEFI 2022.06.30.hellen81.4257220863" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen81.4205694182" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen81.4257220863" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:09 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4867,45 +4869,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index af5cb74264..b4608e5251 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen88bmw.2224017992" + signature = "rusEFI 2022.06.30.hellen88bmw.2212632145" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen88bmw.2224017992" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen88bmw.2212632145" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:06 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 3f973911ae..6bc6a2b567 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellenNA6.1519641996" + signature = "rusEFI 2022.06.30.hellenNA6.1576935829" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellenNA6.1519641996" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellenNA6.1576935829" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:14 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index d9d629bdc8..e92d5f5e2d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellenNA8_96.3668037340" + signature = "rusEFI 2022.06.30.hellenNA8_96.3721136837" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellenNA8_96.3668037340" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellenNA8_96.3721136837" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:16 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index bebf636d4f..0407aeaaff 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.hellen_cypress.2637454054" + signature = "rusEFI 2022.06.30.hellen_cypress.2589564671" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.hellen_cypress.2637454054" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.hellen_cypress.2589564671" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jun 30 03:38:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Jun 30 17:53:43 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4872,45 +4874,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index a81c252376..ff0abb4bf9 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.kin.3279371627" + signature = "rusEFI 2022.06.30.kin.3290102130" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.kin.3279371627" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.kin.3290102130" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jun 30 03:38:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jun 30 17:53:41 UTC 2022 pageSize = 21272 page = 1 @@ -2064,7 +2064,7 @@ tcu_32Vals = array, U08, 21264, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2476,132 +2476,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4102,6 +4103,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4833,45 +4835,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index f57797777b..ecfa32486e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.mre_f4.399415322" + signature = "rusEFI 2022.06.30.mre_f4.279141379" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.mre_f4.399415322" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.mre_f4.279141379" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:19 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4869,45 +4871,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index d74ce88b0c..8d7d2e3af9 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.mre_f7.399415322" + signature = "rusEFI 2022.06.30.mre_f7.279141379" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.mre_f7.399415322" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.mre_f7.279141379" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:37:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:17 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4869,45 +4871,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 5436b36152..29464107c8 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.prometheus_405.2297613578" + signature = "rusEFI 2022.06.30.prometheus_405.2409564435" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.prometheus_405.2297613578" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.prometheus_405.2409564435" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:27 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4867,45 +4869,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 3b11d066e3..5d104b2276 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.prometheus_469.2297613578" + signature = "rusEFI 2022.06.30.prometheus_469.2409564435" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.prometheus_469.2297613578" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.prometheus_469.2409564435" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:25 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4867,45 +4869,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index c09d2492e3..26a41f6e95 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.proteus_f4.2111165338" + signature = "rusEFI 2022.06.30.proteus_f4.2058884995" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.proteus_f4.2111165338" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.proteus_f4.2058884995" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:30 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4865,45 +4867,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 3d4731479e..266a5e9e09 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.proteus_f7.2111165338" + signature = "rusEFI 2022.06.30.proteus_f7.2058884995" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.proteus_f7.2111165338" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.proteus_f7.2058884995" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:29 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4865,45 +4867,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 2dd0d9dd12..a5578bed8b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.proteus_h7.2111165338" + signature = "rusEFI 2022.06.30.proteus_h7.2058884995" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.proteus_h7.2111165338" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.proteus_h7.2058884995" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:32 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4865,45 +4867,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 947bc6dd75..d627b5a738 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.subaru_eg33_f7.3540643166" + signature = "rusEFI 2022.06.30.subaru_eg33_f7.3563333959" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.subaru_eg33_f7.3540643166" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.subaru_eg33_f7.3563333959" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:44 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4868,45 +4870,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index a51508c5fb..ecf6681409 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.30.tdg-pdm8.1913707192" + signature = "rusEFI 2022.06.30.tdg-pdm8.1971134113" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.30.tdg-pdm8.1913707192" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.30.tdg-pdm8.1971134113" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:38 UTC 2022 pageSize = 21300 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1012 + ochBlockSize = 1016 ; ; see TunerStudioOutputChannels struct @@ -2515,132 +2515,133 @@ mainRelayState = bits, U32, 668, [2:2] delayedShutoffRequested = bits, U32, 668, [3:3] ; total TS size = 672 lua_fuelAdd = scalar, F32, 672, "", 1, 0 -lua_clutchUpState = bits, U32, 676, [0:0] -lua_brakePedalState = bits, U32, 676, [1:1] -sd_isTChargeAirModel = bits, U32, 680, [0:0] -sd_airMassInOneCylinder = scalar, F32, 684, "", 1, 0 -sd_tCharge = scalar, F32, 688, "", 1, 0 -sd_tChargeK = scalar, F32, 692, "", 1, 0 -sd_Tcharge_coff = scalar, F32, 696, "", 1, 0 -sd_airFlow = scalar, F32, 700, "", 1, 0 -targetAFR = scalar, F32, 704, "", 1, 0 -engineCycleDurationMs = scalar, F32, 708, "", 1, 0 -minRpmKcurrentTPS = scalar, F32, 712, "", 1, 0 -currentTpsAdc = scalar, S32, 716, "", 1, 0 -tpsVoltageMCU = scalar, F32, 720, "", 1, 0 -tpsVoltageBoard = scalar, F32, 724, "", 1, 0 -currentBaroCorrectedVE = scalar, F32, 728, "", 1, 0 -injectorFlowCorrection = scalar, F32, 732, "", 1, 0 -baroCorrection = scalar, F32, 736, "", 1, 0 -cranking_baseFuel = scalar, F32, 740, "", 1, 0 -cranking_coolantTemperatureCoefficient = scalar, F32, 744, "", 1, 0 -cranking_tpsCoefficient = scalar, F32, 748, "", 1, 0 -cranking_durationCoefficient = scalar, F32, 752, "", 1, 0 -cranking_fuel = scalar, F32, 756, "", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 760, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 764, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 768, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 772, "", 1, 0 -running_injectorLag = scalar, F32, 776, "", 1, 0 -running_baseFuel = scalar, F32, 780, "", 1, 0 -running_fuel = scalar, F32, 784, "", 1, 0 -sparkDwell = scalar, F32, 788, "", 1, 0 -dwellAngle = scalar, F32, 792, "", 1, 0 -cltTimingCorrection = scalar, S16, 796, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 798, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 800, "deg", 0.01, 0 -hellenBoardId = scalar, S16, 802, "id", 1, 0 -clutchUpState = bits, U32, 804, [0:0] -clutchDownState = bits, U32, 804, [1:1] -brakePedalState = bits, U32, 804, [2:2] -; total TS size = 808 -tpsFrom = scalar, F32, 808, "", 1, 0 -tpsTo = scalar, F32, 812, "", 1, 0 -deltaTps = scalar, F32, 816, "", 1, 0 -extraFuel = scalar, F32, 820, "", 1, 0 -valueFromTable = scalar, F32, 824, "", 1, 0 -isAboveAccelThreshold = bits, U32, 828, [0:0] -isBelowDecelThreshold = bits, U32, 828, [1:1] -isTimeToResetAccumulator = bits, U32, 828, [2:2] -isFractionalEnrichment = bits, U32, 828, [3:3] -belowEpsilon = bits, U32, 828, [4:4] -tooShort = bits, U32, 828, [5:5] -fractionalInjFuel = scalar, F32, 832, "", 1, 0 -accumulatedValue = scalar, F32, 836, "", 1, 0 -maxExtraPerCycle = scalar, F32, 840, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 844, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 848, "", 1, 0 -cycleCnt = scalar, S32, 852, "", 1, 0 -; total TS size = 856 -hwEventCounters1 = scalar, S32, 856, "", 1, 0 -hwEventCounters2 = scalar, S32, 860, "", 1, 0 -hwEventCounters3 = scalar, S32, 864, "", 1, 0 -hwEventCounters4 = scalar, S32, 868, "", 1, 0 -hwEventCounters5 = scalar, S32, 872, "", 1, 0 -hwEventCounters6 = scalar, S32, 876, "", 1, 0 -vvtCamCounter = scalar, S32, 880, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 884, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 888, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 892, "", 1, 0 -mapVvt_map_peak = scalar, U08, 893, "", 1, 0 -; total TS size = 896 -totalRevolutionCounter = scalar, U32, 896, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 900, "", 1, 0 -vvtCurrentPosition = scalar, F32, 904, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 908, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 912, "", 1, 0 -triggerStateIndex = scalar, U08, 916, "", 1, 0 -vvtCounter = scalar, U08, 917, "", 1, 0 -vvtSyncCounter = scalar, U08, 918, "", 1, 0 -vvtStateIndex = scalar, U08, 919, "", 1, 0 -; total TS size = 920 -wallFuelCorrection = scalar, F32, 920, "", 1, 0 -wallFuel = scalar, F32, 924, "", 1, 0 -; total TS size = 928 -idleState = scalar, S32, 928, "", 1, 0 -currentIdlePosition = scalar, F32, 932, "", 1, 0 -baseIdlePosition = scalar, F32, 936, "", 1, 0 -iacByTpsTaper = scalar, F32, 940, "", 1, 0 -throttlePedalUpState = scalar, S32, 944, "", 1, 0 -mightResetPid = bits, U32, 948, [0:0] -shouldResetPid = bits, U32, 948, [1:1] -wasResetPid = bits, U32, 948, [2:2] -mustResetPid = bits, U32, 948, [3:3] -isCoasting = bits, U32, 948, [4:4] -useIacTableForCoasting = bits, U32, 948, [5:5] -notIdling = bits, U32, 948, [6:6] -needReset = bits, U32, 948, [7:7] -isInDeadZone = bits, U32, 948, [8:8] -isBlipping = bits, U32, 948, [9:9] -useClosedLoop = bits, U32, 948, [10:10] -badTps = bits, U32, 948, [11:11] -looksLikeRunning = bits, U32, 948, [12:12] -looksLikeCoasting = bits, U32, 948, [13:13] -looksLikeCrankToIdle = bits, U32, 948, [14:14] -useInstantRpmForIdle = bits, U32, 948, [15:15] -isVerboseIAC = bits, U32, 948, [16:16] -targetRpmByClt = scalar, S32, 952, "", 1, 0 -targetRpmAcBump = scalar, S32, 956, "", 1, 0 -; total TS size = 960 -baseDwell = scalar, F32, 960, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 964, "", 1, 0 -luaTimingAdd = scalar, F32, 968, "", 1, 0 -luaTimingMult = scalar, F32, 972, "", 1, 0 -; total TS size = 976 -idlePosition = scalar, F32, 976, "", 1, 0 -trim = scalar, F32, 980, "", 1, 0 -luaAdjustment = scalar, F32, 984, "", 1, 0 -etbFeedForward = scalar, F32, 988, "", 1, 0 -etbIntegralError = scalar, F32, 992, "", 1, 0 -etbCurrentTarget = scalar, F32, 996, "%", 1, 0 -; total TS size = 1000 -faultCode = scalar, U08, 1000, "", 1, 0 -heaterDuty = scalar, U08, 1001, "%", 1, 0 -pumpDuty = scalar, U08, 1002, "%", 1, 0 -tempC = scalar, U16, 1004, "C", 1, 0 -nernstVoltage = scalar, U16, 1006, "V", 0.001, 0 -esr = scalar, U16, 1008, "", 1, 0 -; total TS size = 1012 +lua_fuelMult = scalar, F32, 676, "", 1, 0 +lua_clutchUpState = bits, U32, 680, [0:0] +lua_brakePedalState = bits, U32, 680, [1:1] +sd_isTChargeAirModel = bits, U32, 684, [0:0] +sd_airMassInOneCylinder = scalar, F32, 688, "", 1, 0 +sd_tCharge = scalar, F32, 692, "", 1, 0 +sd_tChargeK = scalar, F32, 696, "", 1, 0 +sd_Tcharge_coff = scalar, F32, 700, "", 1, 0 +sd_airFlow = scalar, F32, 704, "", 1, 0 +targetAFR = scalar, F32, 708, "", 1, 0 +engineCycleDurationMs = scalar, F32, 712, "", 1, 0 +minRpmKcurrentTPS = scalar, F32, 716, "", 1, 0 +currentTpsAdc = scalar, S32, 720, "", 1, 0 +tpsVoltageMCU = scalar, F32, 724, "", 1, 0 +tpsVoltageBoard = scalar, F32, 728, "", 1, 0 +currentBaroCorrectedVE = scalar, F32, 732, "", 1, 0 +injectorFlowCorrection = scalar, F32, 736, "", 1, 0 +baroCorrection = scalar, F32, 740, "", 1, 0 +cranking_baseFuel = scalar, F32, 744, "", 1, 0 +cranking_coolantTemperatureCoefficient = scalar, F32, 748, "", 1, 0 +cranking_tpsCoefficient = scalar, F32, 752, "", 1, 0 +cranking_durationCoefficient = scalar, F32, 756, "", 1, 0 +cranking_fuel = scalar, F32, 760, "", 1, 0 +running_postCrankingFuelCorrection = scalar, F32, 764, "", 1, 0 +running_intakeTemperatureCoefficient = scalar, F32, 768, "", 1, 0 +running_coolantTemperatureCoefficient = scalar, F32, 772, "", 1, 0 +running_timeSinceCrankingInSecs = scalar, F32, 776, "", 1, 0 +running_injectorLag = scalar, F32, 780, "", 1, 0 +running_baseFuel = scalar, F32, 784, "", 1, 0 +running_fuel = scalar, F32, 788, "", 1, 0 +sparkDwell = scalar, F32, 792, "", 1, 0 +dwellAngle = scalar, F32, 796, "", 1, 0 +cltTimingCorrection = scalar, S16, 800, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 802, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 804, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 806, "id", 1, 0 +clutchUpState = bits, U32, 808, [0:0] +clutchDownState = bits, U32, 808, [1:1] +brakePedalState = bits, U32, 808, [2:2] +; total TS size = 812 +tpsFrom = scalar, F32, 812, "", 1, 0 +tpsTo = scalar, F32, 816, "", 1, 0 +deltaTps = scalar, F32, 820, "", 1, 0 +extraFuel = scalar, F32, 824, "", 1, 0 +valueFromTable = scalar, F32, 828, "", 1, 0 +isAboveAccelThreshold = bits, U32, 832, [0:0] +isBelowDecelThreshold = bits, U32, 832, [1:1] +isTimeToResetAccumulator = bits, U32, 832, [2:2] +isFractionalEnrichment = bits, U32, 832, [3:3] +belowEpsilon = bits, U32, 832, [4:4] +tooShort = bits, U32, 832, [5:5] +fractionalInjFuel = scalar, F32, 836, "", 1, 0 +accumulatedValue = scalar, F32, 840, "", 1, 0 +maxExtraPerCycle = scalar, F32, 844, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 848, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 852, "", 1, 0 +cycleCnt = scalar, S32, 856, "", 1, 0 +; total TS size = 860 +hwEventCounters1 = scalar, S32, 860, "", 1, 0 +hwEventCounters2 = scalar, S32, 864, "", 1, 0 +hwEventCounters3 = scalar, S32, 868, "", 1, 0 +hwEventCounters4 = scalar, S32, 872, "", 1, 0 +hwEventCounters5 = scalar, S32, 876, "", 1, 0 +hwEventCounters6 = scalar, S32, 880, "", 1, 0 +vvtCamCounter = scalar, S32, 884, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 888, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 892, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 896, "", 1, 0 +mapVvt_map_peak = scalar, U08, 897, "", 1, 0 +; total TS size = 900 +totalRevolutionCounter = scalar, U32, 900, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 904, "", 1, 0 +vvtCurrentPosition = scalar, F32, 908, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 912, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 916, "", 1, 0 +triggerStateIndex = scalar, U08, 920, "", 1, 0 +vvtCounter = scalar, U08, 921, "", 1, 0 +vvtSyncCounter = scalar, U08, 922, "", 1, 0 +vvtStateIndex = scalar, U08, 923, "", 1, 0 +; total TS size = 924 +wallFuelCorrection = scalar, F32, 924, "", 1, 0 +wallFuel = scalar, F32, 928, "", 1, 0 +; total TS size = 932 +idleState = scalar, S32, 932, "", 1, 0 +currentIdlePosition = scalar, F32, 936, "", 1, 0 +baseIdlePosition = scalar, F32, 940, "", 1, 0 +iacByTpsTaper = scalar, F32, 944, "", 1, 0 +throttlePedalUpState = scalar, S32, 948, "", 1, 0 +mightResetPid = bits, U32, 952, [0:0] +shouldResetPid = bits, U32, 952, [1:1] +wasResetPid = bits, U32, 952, [2:2] +mustResetPid = bits, U32, 952, [3:3] +isCoasting = bits, U32, 952, [4:4] +useIacTableForCoasting = bits, U32, 952, [5:5] +notIdling = bits, U32, 952, [6:6] +needReset = bits, U32, 952, [7:7] +isInDeadZone = bits, U32, 952, [8:8] +isBlipping = bits, U32, 952, [9:9] +useClosedLoop = bits, U32, 952, [10:10] +badTps = bits, U32, 952, [11:11] +looksLikeRunning = bits, U32, 952, [12:12] +looksLikeCoasting = bits, U32, 952, [13:13] +looksLikeCrankToIdle = bits, U32, 952, [14:14] +useInstantRpmForIdle = bits, U32, 952, [15:15] +isVerboseIAC = bits, U32, 952, [16:16] +targetRpmByClt = scalar, S32, 956, "", 1, 0 +targetRpmAcBump = scalar, S32, 960, "", 1, 0 +; total TS size = 964 +baseDwell = scalar, F32, 964, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 968, "", 1, 0 +luaTimingAdd = scalar, F32, 972, "", 1, 0 +luaTimingMult = scalar, F32, 976, "", 1, 0 +; total TS size = 980 +idlePosition = scalar, F32, 980, "", 1, 0 +trim = scalar, F32, 984, "", 1, 0 +luaAdjustment = scalar, F32, 988, "", 1, 0 +etbFeedForward = scalar, F32, 992, "", 1, 0 +etbIntegralError = scalar, F32, 996, "", 1, 0 +etbCurrentTarget = scalar, F32, 1000, "%", 1, 0 +; total TS size = 1004 +faultCode = scalar, U08, 1004, "", 1, 0 +heaterDuty = scalar, U08, 1005, "%", 1, 0 +pumpDuty = scalar, U08, 1006, "%", 1, 0 +tempC = scalar, U16, 1008, "C", 1, 0 +nernstVoltage = scalar, U16, 1010, "V", 0.001, 0 +esr = scalar, U16, 1012, "", 1, 0 +; total TS size = 1016 time = { timeNow } @@ -4141,6 +4142,7 @@ entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" entry = mainRelayState, "mainRelayState", int, "%d" entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" entry = lua_fuelAdd, "lua_fuelAdd", float, "%.3f" +entry = lua_fuelMult, "lua_fuelMult", float, "%.3f" entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" entry = sd_isTChargeAirModel, "sd_isTChargeAirModel", int, "%d" @@ -4872,45 +4874,46 @@ dialog = engine_stateDialog, "engine_state" panel = engine_stateIndicatorPanel liveGraph = engine_state_1_Graph, "Graph", South graphLine = lua_fuelAdd + graphLine = lua_fuelMult graphLine = sd_airMassInOneCylinder graphLine = sd_tCharge - graphLine = sd_tChargeK liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_tChargeK graphLine = sd_Tcharge_coff graphLine = sd_airFlow graphLine = targetAFR - graphLine = engineCycleDurationMs liveGraph = engine_state_3_Graph, "Graph", South + graphLine = engineCycleDurationMs graphLine = minRpmKcurrentTPS graphLine = currentTpsAdc graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard liveGraph = engine_state_4_Graph, "Graph", South + graphLine = tpsVoltageBoard graphLine = currentBaroCorrectedVE graphLine = injectorFlowCorrection graphLine = baroCorrection - graphLine = cranking_baseFuel liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_baseFuel graphLine = cranking_coolantTemperatureCoefficient graphLine = cranking_tpsCoefficient graphLine = cranking_durationCoefficient - graphLine = cranking_fuel liveGraph = engine_state_6_Graph, "Graph", South + graphLine = cranking_fuel graphLine = running_postCrankingFuelCorrection graphLine = running_intakeTemperatureCoefficient graphLine = running_coolantTemperatureCoefficient - graphLine = running_timeSinceCrankingInSecs liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_timeSinceCrankingInSecs graphLine = running_injectorLag graphLine = running_baseFuel graphLine = running_fuel - graphLine = sparkDwell liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection graphLine = timingIatCorrection - graphLine = timingPidCorrection liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 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 aab57d6ade..31d28e3107 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 Thu Jun 30 03:37:30 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Jun 30 17:52:53 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -392,168 +392,170 @@ public class EngineState { 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); - public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 4, FieldType.BIT, 0); - public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 4, FieldType.BIT, 1); - public static final Field LUA_UNUSEDBIT_3_2 = Field.create("LUA_UNUSEDBIT_3_2", 4, FieldType.BIT, 2); - public static final Field LUA_UNUSEDBIT_3_3 = Field.create("LUA_UNUSEDBIT_3_3", 4, FieldType.BIT, 3); - public static final Field LUA_UNUSEDBIT_3_4 = Field.create("LUA_UNUSEDBIT_3_4", 4, FieldType.BIT, 4); - public static final Field LUA_UNUSEDBIT_3_5 = Field.create("LUA_UNUSEDBIT_3_5", 4, FieldType.BIT, 5); - public static final Field LUA_UNUSEDBIT_3_6 = Field.create("LUA_UNUSEDBIT_3_6", 4, FieldType.BIT, 6); - public static final Field LUA_UNUSEDBIT_3_7 = Field.create("LUA_UNUSEDBIT_3_7", 4, FieldType.BIT, 7); - public static final Field LUA_UNUSEDBIT_3_8 = Field.create("LUA_UNUSEDBIT_3_8", 4, FieldType.BIT, 8); - public static final Field LUA_UNUSEDBIT_3_9 = Field.create("LUA_UNUSEDBIT_3_9", 4, FieldType.BIT, 9); - public static final Field LUA_UNUSEDBIT_3_10 = Field.create("LUA_UNUSEDBIT_3_10", 4, FieldType.BIT, 10); - public static final Field LUA_UNUSEDBIT_3_11 = Field.create("LUA_UNUSEDBIT_3_11", 4, FieldType.BIT, 11); - public static final Field LUA_UNUSEDBIT_3_12 = Field.create("LUA_UNUSEDBIT_3_12", 4, FieldType.BIT, 12); - public static final Field LUA_UNUSEDBIT_3_13 = Field.create("LUA_UNUSEDBIT_3_13", 4, FieldType.BIT, 13); - public static final Field LUA_UNUSEDBIT_3_14 = Field.create("LUA_UNUSEDBIT_3_14", 4, FieldType.BIT, 14); - public static final Field LUA_UNUSEDBIT_3_15 = Field.create("LUA_UNUSEDBIT_3_15", 4, FieldType.BIT, 15); - public static final Field LUA_UNUSEDBIT_3_16 = Field.create("LUA_UNUSEDBIT_3_16", 4, FieldType.BIT, 16); - public static final Field LUA_UNUSEDBIT_3_17 = Field.create("LUA_UNUSEDBIT_3_17", 4, FieldType.BIT, 17); - public static final Field LUA_UNUSEDBIT_3_18 = Field.create("LUA_UNUSEDBIT_3_18", 4, FieldType.BIT, 18); - public static final Field LUA_UNUSEDBIT_3_19 = Field.create("LUA_UNUSEDBIT_3_19", 4, FieldType.BIT, 19); - public static final Field LUA_UNUSEDBIT_3_20 = Field.create("LUA_UNUSEDBIT_3_20", 4, FieldType.BIT, 20); - public static final Field LUA_UNUSEDBIT_3_21 = Field.create("LUA_UNUSEDBIT_3_21", 4, FieldType.BIT, 21); - public static final Field LUA_UNUSEDBIT_3_22 = Field.create("LUA_UNUSEDBIT_3_22", 4, FieldType.BIT, 22); - public static final Field LUA_UNUSEDBIT_3_23 = Field.create("LUA_UNUSEDBIT_3_23", 4, FieldType.BIT, 23); - public static final Field LUA_UNUSEDBIT_3_24 = Field.create("LUA_UNUSEDBIT_3_24", 4, FieldType.BIT, 24); - public static final Field LUA_UNUSEDBIT_3_25 = Field.create("LUA_UNUSEDBIT_3_25", 4, FieldType.BIT, 25); - public static final Field LUA_UNUSEDBIT_3_26 = Field.create("LUA_UNUSEDBIT_3_26", 4, FieldType.BIT, 26); - public static final Field LUA_UNUSEDBIT_3_27 = Field.create("LUA_UNUSEDBIT_3_27", 4, FieldType.BIT, 27); - public static final Field LUA_UNUSEDBIT_3_28 = Field.create("LUA_UNUSEDBIT_3_28", 4, FieldType.BIT, 28); - public static final Field LUA_UNUSEDBIT_3_29 = Field.create("LUA_UNUSEDBIT_3_29", 4, FieldType.BIT, 29); - public static final Field LUA_UNUSEDBIT_3_30 = Field.create("LUA_UNUSEDBIT_3_30", 4, FieldType.BIT, 30); - public static final Field LUA_UNUSEDBIT_3_31 = Field.create("LUA_UNUSEDBIT_3_31", 4, FieldType.BIT, 31); - public static final Field SD_ISTCHARGEAIRMODEL = Field.create("SD_ISTCHARGEAIRMODEL", 8, FieldType.BIT, 0); - public static final Field SD_UNUSEDBIT_1_1 = Field.create("SD_UNUSEDBIT_1_1", 8, FieldType.BIT, 1); - public static final Field SD_UNUSEDBIT_1_2 = Field.create("SD_UNUSEDBIT_1_2", 8, FieldType.BIT, 2); - public static final Field SD_UNUSEDBIT_1_3 = Field.create("SD_UNUSEDBIT_1_3", 8, FieldType.BIT, 3); - public static final Field SD_UNUSEDBIT_1_4 = Field.create("SD_UNUSEDBIT_1_4", 8, FieldType.BIT, 4); - public static final Field SD_UNUSEDBIT_1_5 = Field.create("SD_UNUSEDBIT_1_5", 8, FieldType.BIT, 5); - public static final Field SD_UNUSEDBIT_1_6 = Field.create("SD_UNUSEDBIT_1_6", 8, FieldType.BIT, 6); - public static final Field SD_UNUSEDBIT_1_7 = Field.create("SD_UNUSEDBIT_1_7", 8, FieldType.BIT, 7); - public static final Field SD_UNUSEDBIT_1_8 = Field.create("SD_UNUSEDBIT_1_8", 8, FieldType.BIT, 8); - public static final Field SD_UNUSEDBIT_1_9 = Field.create("SD_UNUSEDBIT_1_9", 8, FieldType.BIT, 9); - public static final Field SD_UNUSEDBIT_1_10 = Field.create("SD_UNUSEDBIT_1_10", 8, FieldType.BIT, 10); - public static final Field SD_UNUSEDBIT_1_11 = Field.create("SD_UNUSEDBIT_1_11", 8, FieldType.BIT, 11); - public static final Field SD_UNUSEDBIT_1_12 = Field.create("SD_UNUSEDBIT_1_12", 8, FieldType.BIT, 12); - public static final Field SD_UNUSEDBIT_1_13 = Field.create("SD_UNUSEDBIT_1_13", 8, FieldType.BIT, 13); - public static final Field SD_UNUSEDBIT_1_14 = Field.create("SD_UNUSEDBIT_1_14", 8, FieldType.BIT, 14); - public static final Field SD_UNUSEDBIT_1_15 = Field.create("SD_UNUSEDBIT_1_15", 8, FieldType.BIT, 15); - public static final Field SD_UNUSEDBIT_1_16 = Field.create("SD_UNUSEDBIT_1_16", 8, FieldType.BIT, 16); - public static final Field SD_UNUSEDBIT_1_17 = Field.create("SD_UNUSEDBIT_1_17", 8, FieldType.BIT, 17); - public static final Field SD_UNUSEDBIT_1_18 = Field.create("SD_UNUSEDBIT_1_18", 8, FieldType.BIT, 18); - public static final Field SD_UNUSEDBIT_1_19 = Field.create("SD_UNUSEDBIT_1_19", 8, FieldType.BIT, 19); - public static final Field SD_UNUSEDBIT_1_20 = Field.create("SD_UNUSEDBIT_1_20", 8, FieldType.BIT, 20); - public static final Field SD_UNUSEDBIT_1_21 = Field.create("SD_UNUSEDBIT_1_21", 8, FieldType.BIT, 21); - public static final Field SD_UNUSEDBIT_1_22 = Field.create("SD_UNUSEDBIT_1_22", 8, FieldType.BIT, 22); - public static final Field SD_UNUSEDBIT_1_23 = Field.create("SD_UNUSEDBIT_1_23", 8, FieldType.BIT, 23); - public static final Field SD_UNUSEDBIT_1_24 = Field.create("SD_UNUSEDBIT_1_24", 8, FieldType.BIT, 24); - public static final Field SD_UNUSEDBIT_1_25 = Field.create("SD_UNUSEDBIT_1_25", 8, FieldType.BIT, 25); - public static final Field SD_UNUSEDBIT_1_26 = Field.create("SD_UNUSEDBIT_1_26", 8, FieldType.BIT, 26); - public static final Field SD_UNUSEDBIT_1_27 = Field.create("SD_UNUSEDBIT_1_27", 8, FieldType.BIT, 27); - public static final Field SD_UNUSEDBIT_1_28 = Field.create("SD_UNUSEDBIT_1_28", 8, FieldType.BIT, 28); - public static final Field SD_UNUSEDBIT_1_29 = Field.create("SD_UNUSEDBIT_1_29", 8, FieldType.BIT, 29); - public static final Field SD_UNUSEDBIT_1_30 = Field.create("SD_UNUSEDBIT_1_30", 8, FieldType.BIT, 30); - public static final Field SD_UNUSEDBIT_1_31 = Field.create("SD_UNUSEDBIT_1_31", 8, FieldType.BIT, 31); - public static final Field SD_AIRMASSINONECYLINDER = Field.create("SD_AIRMASSINONECYLINDER", 12, FieldType.FLOAT); - public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 16, FieldType.FLOAT); - public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 20, FieldType.FLOAT); - public static final Field SD_TCHARGE_COFF = Field.create("SD_TCHARGE_COFF", 24, FieldType.FLOAT); - public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 28, FieldType.FLOAT); - public static final Field TARGETAFR = Field.create("TARGETAFR", 32, FieldType.FLOAT); - public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 36, FieldType.FLOAT); - public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 40, FieldType.FLOAT); - public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 44, FieldType.INT).setScale(1.0); - public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 48, FieldType.FLOAT); - public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 52, FieldType.FLOAT); - public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 56, FieldType.FLOAT); - public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 60, FieldType.FLOAT); - public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 64, FieldType.FLOAT); - public static final Field CRANKING_BASEFUEL = Field.create("CRANKING_BASEFUEL", 68, FieldType.FLOAT); - public static final Field CRANKING_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKING_COOLANTTEMPERATURECOEFFICIENT", 72, FieldType.FLOAT); - public static final Field CRANKING_TPSCOEFFICIENT = Field.create("CRANKING_TPSCOEFFICIENT", 76, FieldType.FLOAT); - public static final Field CRANKING_DURATIONCOEFFICIENT = Field.create("CRANKING_DURATIONCOEFFICIENT", 80, FieldType.FLOAT); - public static final Field CRANKING_FUEL = Field.create("CRANKING_FUEL", 84, FieldType.FLOAT); - public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 88, FieldType.FLOAT); - public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 92, FieldType.FLOAT); - public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 96, FieldType.FLOAT); - public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 100, FieldType.FLOAT); - public static final Field RUNNING_INJECTORLAG = Field.create("RUNNING_INJECTORLAG", 104, FieldType.FLOAT); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 108, FieldType.FLOAT); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 112, FieldType.FLOAT); - public static final Field SPARKDWELL = Field.create("SPARKDWELL", 116, FieldType.FLOAT); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 120, FieldType.FLOAT); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 124, FieldType.INT16).setScale(0.01); - public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 126, FieldType.INT16).setScale(0.01); - public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 128, FieldType.INT16).setScale(0.01); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 130, FieldType.INT16).setScale(1.0); - public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 132, FieldType.BIT, 0); - public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 132, FieldType.BIT, 1); - public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 132, FieldType.BIT, 2); - public static final Field UNUSEDBIT_22_3 = Field.create("UNUSEDBIT_22_3", 132, FieldType.BIT, 3); - public static final Field UNUSEDBIT_22_4 = Field.create("UNUSEDBIT_22_4", 132, FieldType.BIT, 4); - public static final Field UNUSEDBIT_22_5 = Field.create("UNUSEDBIT_22_5", 132, FieldType.BIT, 5); - public static final Field UNUSEDBIT_22_6 = Field.create("UNUSEDBIT_22_6", 132, FieldType.BIT, 6); - public static final Field UNUSEDBIT_22_7 = Field.create("UNUSEDBIT_22_7", 132, FieldType.BIT, 7); - public static final Field UNUSEDBIT_22_8 = Field.create("UNUSEDBIT_22_8", 132, FieldType.BIT, 8); - public static final Field UNUSEDBIT_22_9 = Field.create("UNUSEDBIT_22_9", 132, FieldType.BIT, 9); - public static final Field UNUSEDBIT_22_10 = Field.create("UNUSEDBIT_22_10", 132, FieldType.BIT, 10); - public static final Field UNUSEDBIT_22_11 = Field.create("UNUSEDBIT_22_11", 132, FieldType.BIT, 11); - public static final Field UNUSEDBIT_22_12 = Field.create("UNUSEDBIT_22_12", 132, FieldType.BIT, 12); - public static final Field UNUSEDBIT_22_13 = Field.create("UNUSEDBIT_22_13", 132, FieldType.BIT, 13); - public static final Field UNUSEDBIT_22_14 = Field.create("UNUSEDBIT_22_14", 132, FieldType.BIT, 14); - public static final Field UNUSEDBIT_22_15 = Field.create("UNUSEDBIT_22_15", 132, FieldType.BIT, 15); - public static final Field UNUSEDBIT_22_16 = Field.create("UNUSEDBIT_22_16", 132, FieldType.BIT, 16); - public static final Field UNUSEDBIT_22_17 = Field.create("UNUSEDBIT_22_17", 132, FieldType.BIT, 17); - public static final Field UNUSEDBIT_22_18 = Field.create("UNUSEDBIT_22_18", 132, FieldType.BIT, 18); - public static final Field UNUSEDBIT_22_19 = Field.create("UNUSEDBIT_22_19", 132, FieldType.BIT, 19); - public static final Field UNUSEDBIT_22_20 = Field.create("UNUSEDBIT_22_20", 132, FieldType.BIT, 20); - public static final Field UNUSEDBIT_22_21 = Field.create("UNUSEDBIT_22_21", 132, FieldType.BIT, 21); - public static final Field UNUSEDBIT_22_22 = Field.create("UNUSEDBIT_22_22", 132, FieldType.BIT, 22); - public static final Field UNUSEDBIT_22_23 = Field.create("UNUSEDBIT_22_23", 132, FieldType.BIT, 23); - public static final Field UNUSEDBIT_22_24 = Field.create("UNUSEDBIT_22_24", 132, FieldType.BIT, 24); - public static final Field UNUSEDBIT_22_25 = Field.create("UNUSEDBIT_22_25", 132, FieldType.BIT, 25); - public static final Field UNUSEDBIT_22_26 = Field.create("UNUSEDBIT_22_26", 132, FieldType.BIT, 26); - public static final Field UNUSEDBIT_22_27 = Field.create("UNUSEDBIT_22_27", 132, FieldType.BIT, 27); - public static final Field UNUSEDBIT_22_28 = Field.create("UNUSEDBIT_22_28", 132, FieldType.BIT, 28); - public static final Field UNUSEDBIT_22_29 = Field.create("UNUSEDBIT_22_29", 132, FieldType.BIT, 29); - public static final Field UNUSEDBIT_22_30 = Field.create("UNUSEDBIT_22_30", 132, FieldType.BIT, 30); - public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 132, FieldType.BIT, 31); + public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT); + public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0); + public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1); + public static final Field LUA_UNUSEDBIT_4_2 = Field.create("LUA_UNUSEDBIT_4_2", 8, FieldType.BIT, 2); + public static final Field LUA_UNUSEDBIT_4_3 = Field.create("LUA_UNUSEDBIT_4_3", 8, FieldType.BIT, 3); + public static final Field LUA_UNUSEDBIT_4_4 = Field.create("LUA_UNUSEDBIT_4_4", 8, FieldType.BIT, 4); + public static final Field LUA_UNUSEDBIT_4_5 = Field.create("LUA_UNUSEDBIT_4_5", 8, FieldType.BIT, 5); + public static final Field LUA_UNUSEDBIT_4_6 = Field.create("LUA_UNUSEDBIT_4_6", 8, FieldType.BIT, 6); + public static final Field LUA_UNUSEDBIT_4_7 = Field.create("LUA_UNUSEDBIT_4_7", 8, FieldType.BIT, 7); + public static final Field LUA_UNUSEDBIT_4_8 = Field.create("LUA_UNUSEDBIT_4_8", 8, FieldType.BIT, 8); + public static final Field LUA_UNUSEDBIT_4_9 = Field.create("LUA_UNUSEDBIT_4_9", 8, FieldType.BIT, 9); + public static final Field LUA_UNUSEDBIT_4_10 = Field.create("LUA_UNUSEDBIT_4_10", 8, FieldType.BIT, 10); + public static final Field LUA_UNUSEDBIT_4_11 = Field.create("LUA_UNUSEDBIT_4_11", 8, FieldType.BIT, 11); + public static final Field LUA_UNUSEDBIT_4_12 = Field.create("LUA_UNUSEDBIT_4_12", 8, FieldType.BIT, 12); + public static final Field LUA_UNUSEDBIT_4_13 = Field.create("LUA_UNUSEDBIT_4_13", 8, FieldType.BIT, 13); + public static final Field LUA_UNUSEDBIT_4_14 = Field.create("LUA_UNUSEDBIT_4_14", 8, FieldType.BIT, 14); + public static final Field LUA_UNUSEDBIT_4_15 = Field.create("LUA_UNUSEDBIT_4_15", 8, FieldType.BIT, 15); + public static final Field LUA_UNUSEDBIT_4_16 = Field.create("LUA_UNUSEDBIT_4_16", 8, FieldType.BIT, 16); + public static final Field LUA_UNUSEDBIT_4_17 = Field.create("LUA_UNUSEDBIT_4_17", 8, FieldType.BIT, 17); + public static final Field LUA_UNUSEDBIT_4_18 = Field.create("LUA_UNUSEDBIT_4_18", 8, FieldType.BIT, 18); + public static final Field LUA_UNUSEDBIT_4_19 = Field.create("LUA_UNUSEDBIT_4_19", 8, FieldType.BIT, 19); + public static final Field LUA_UNUSEDBIT_4_20 = Field.create("LUA_UNUSEDBIT_4_20", 8, FieldType.BIT, 20); + public static final Field LUA_UNUSEDBIT_4_21 = Field.create("LUA_UNUSEDBIT_4_21", 8, FieldType.BIT, 21); + public static final Field LUA_UNUSEDBIT_4_22 = Field.create("LUA_UNUSEDBIT_4_22", 8, FieldType.BIT, 22); + public static final Field LUA_UNUSEDBIT_4_23 = Field.create("LUA_UNUSEDBIT_4_23", 8, FieldType.BIT, 23); + public static final Field LUA_UNUSEDBIT_4_24 = Field.create("LUA_UNUSEDBIT_4_24", 8, FieldType.BIT, 24); + public static final Field LUA_UNUSEDBIT_4_25 = Field.create("LUA_UNUSEDBIT_4_25", 8, FieldType.BIT, 25); + public static final Field LUA_UNUSEDBIT_4_26 = Field.create("LUA_UNUSEDBIT_4_26", 8, FieldType.BIT, 26); + public static final Field LUA_UNUSEDBIT_4_27 = Field.create("LUA_UNUSEDBIT_4_27", 8, FieldType.BIT, 27); + public static final Field LUA_UNUSEDBIT_4_28 = Field.create("LUA_UNUSEDBIT_4_28", 8, FieldType.BIT, 28); + public static final Field LUA_UNUSEDBIT_4_29 = Field.create("LUA_UNUSEDBIT_4_29", 8, FieldType.BIT, 29); + public static final Field LUA_UNUSEDBIT_4_30 = Field.create("LUA_UNUSEDBIT_4_30", 8, FieldType.BIT, 30); + public static final Field LUA_UNUSEDBIT_4_31 = Field.create("LUA_UNUSEDBIT_4_31", 8, FieldType.BIT, 31); + public static final Field SD_ISTCHARGEAIRMODEL = Field.create("SD_ISTCHARGEAIRMODEL", 12, FieldType.BIT, 0); + public static final Field SD_UNUSEDBIT_1_1 = Field.create("SD_UNUSEDBIT_1_1", 12, FieldType.BIT, 1); + public static final Field SD_UNUSEDBIT_1_2 = Field.create("SD_UNUSEDBIT_1_2", 12, FieldType.BIT, 2); + public static final Field SD_UNUSEDBIT_1_3 = Field.create("SD_UNUSEDBIT_1_3", 12, FieldType.BIT, 3); + public static final Field SD_UNUSEDBIT_1_4 = Field.create("SD_UNUSEDBIT_1_4", 12, FieldType.BIT, 4); + public static final Field SD_UNUSEDBIT_1_5 = Field.create("SD_UNUSEDBIT_1_5", 12, FieldType.BIT, 5); + public static final Field SD_UNUSEDBIT_1_6 = Field.create("SD_UNUSEDBIT_1_6", 12, FieldType.BIT, 6); + public static final Field SD_UNUSEDBIT_1_7 = Field.create("SD_UNUSEDBIT_1_7", 12, FieldType.BIT, 7); + public static final Field SD_UNUSEDBIT_1_8 = Field.create("SD_UNUSEDBIT_1_8", 12, FieldType.BIT, 8); + public static final Field SD_UNUSEDBIT_1_9 = Field.create("SD_UNUSEDBIT_1_9", 12, FieldType.BIT, 9); + public static final Field SD_UNUSEDBIT_1_10 = Field.create("SD_UNUSEDBIT_1_10", 12, FieldType.BIT, 10); + public static final Field SD_UNUSEDBIT_1_11 = Field.create("SD_UNUSEDBIT_1_11", 12, FieldType.BIT, 11); + public static final Field SD_UNUSEDBIT_1_12 = Field.create("SD_UNUSEDBIT_1_12", 12, FieldType.BIT, 12); + public static final Field SD_UNUSEDBIT_1_13 = Field.create("SD_UNUSEDBIT_1_13", 12, FieldType.BIT, 13); + public static final Field SD_UNUSEDBIT_1_14 = Field.create("SD_UNUSEDBIT_1_14", 12, FieldType.BIT, 14); + public static final Field SD_UNUSEDBIT_1_15 = Field.create("SD_UNUSEDBIT_1_15", 12, FieldType.BIT, 15); + public static final Field SD_UNUSEDBIT_1_16 = Field.create("SD_UNUSEDBIT_1_16", 12, FieldType.BIT, 16); + public static final Field SD_UNUSEDBIT_1_17 = Field.create("SD_UNUSEDBIT_1_17", 12, FieldType.BIT, 17); + public static final Field SD_UNUSEDBIT_1_18 = Field.create("SD_UNUSEDBIT_1_18", 12, FieldType.BIT, 18); + public static final Field SD_UNUSEDBIT_1_19 = Field.create("SD_UNUSEDBIT_1_19", 12, FieldType.BIT, 19); + public static final Field SD_UNUSEDBIT_1_20 = Field.create("SD_UNUSEDBIT_1_20", 12, FieldType.BIT, 20); + public static final Field SD_UNUSEDBIT_1_21 = Field.create("SD_UNUSEDBIT_1_21", 12, FieldType.BIT, 21); + public static final Field SD_UNUSEDBIT_1_22 = Field.create("SD_UNUSEDBIT_1_22", 12, FieldType.BIT, 22); + public static final Field SD_UNUSEDBIT_1_23 = Field.create("SD_UNUSEDBIT_1_23", 12, FieldType.BIT, 23); + public static final Field SD_UNUSEDBIT_1_24 = Field.create("SD_UNUSEDBIT_1_24", 12, FieldType.BIT, 24); + public static final Field SD_UNUSEDBIT_1_25 = Field.create("SD_UNUSEDBIT_1_25", 12, FieldType.BIT, 25); + public static final Field SD_UNUSEDBIT_1_26 = Field.create("SD_UNUSEDBIT_1_26", 12, FieldType.BIT, 26); + public static final Field SD_UNUSEDBIT_1_27 = Field.create("SD_UNUSEDBIT_1_27", 12, FieldType.BIT, 27); + public static final Field SD_UNUSEDBIT_1_28 = Field.create("SD_UNUSEDBIT_1_28", 12, FieldType.BIT, 28); + public static final Field SD_UNUSEDBIT_1_29 = Field.create("SD_UNUSEDBIT_1_29", 12, FieldType.BIT, 29); + public static final Field SD_UNUSEDBIT_1_30 = Field.create("SD_UNUSEDBIT_1_30", 12, FieldType.BIT, 30); + public static final Field SD_UNUSEDBIT_1_31 = Field.create("SD_UNUSEDBIT_1_31", 12, FieldType.BIT, 31); + public static final Field SD_AIRMASSINONECYLINDER = Field.create("SD_AIRMASSINONECYLINDER", 16, FieldType.FLOAT); + public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 20, FieldType.FLOAT); + public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 24, FieldType.FLOAT); + public static final Field SD_TCHARGE_COFF = Field.create("SD_TCHARGE_COFF", 28, FieldType.FLOAT); + public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 32, FieldType.FLOAT); + public static final Field TARGETAFR = Field.create("TARGETAFR", 36, FieldType.FLOAT); + public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 40, FieldType.FLOAT); + public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 44, FieldType.FLOAT); + public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 48, FieldType.INT).setScale(1.0); + public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 52, FieldType.FLOAT); + public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 56, FieldType.FLOAT); + public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 60, FieldType.FLOAT); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 64, FieldType.FLOAT); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 68, FieldType.FLOAT); + public static final Field CRANKING_BASEFUEL = Field.create("CRANKING_BASEFUEL", 72, FieldType.FLOAT); + public static final Field CRANKING_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKING_COOLANTTEMPERATURECOEFFICIENT", 76, FieldType.FLOAT); + public static final Field CRANKING_TPSCOEFFICIENT = Field.create("CRANKING_TPSCOEFFICIENT", 80, FieldType.FLOAT); + public static final Field CRANKING_DURATIONCOEFFICIENT = Field.create("CRANKING_DURATIONCOEFFICIENT", 84, FieldType.FLOAT); + public static final Field CRANKING_FUEL = Field.create("CRANKING_FUEL", 88, FieldType.FLOAT); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 92, FieldType.FLOAT); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 96, FieldType.FLOAT); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 100, FieldType.FLOAT); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 104, FieldType.FLOAT); + public static final Field RUNNING_INJECTORLAG = Field.create("RUNNING_INJECTORLAG", 108, FieldType.FLOAT); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 112, FieldType.FLOAT); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 116, FieldType.FLOAT); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 120, FieldType.FLOAT); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 124, FieldType.FLOAT); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 128, FieldType.INT16).setScale(0.01); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 130, FieldType.INT16).setScale(0.01); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 132, FieldType.INT16).setScale(0.01); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 134, FieldType.INT16).setScale(1.0); + public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 136, FieldType.BIT, 0); + public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 136, FieldType.BIT, 1); + public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 136, FieldType.BIT, 2); + public static final Field UNUSEDBIT_22_3 = Field.create("UNUSEDBIT_22_3", 136, FieldType.BIT, 3); + public static final Field UNUSEDBIT_22_4 = Field.create("UNUSEDBIT_22_4", 136, FieldType.BIT, 4); + public static final Field UNUSEDBIT_22_5 = Field.create("UNUSEDBIT_22_5", 136, FieldType.BIT, 5); + public static final Field UNUSEDBIT_22_6 = Field.create("UNUSEDBIT_22_6", 136, FieldType.BIT, 6); + public static final Field UNUSEDBIT_22_7 = Field.create("UNUSEDBIT_22_7", 136, FieldType.BIT, 7); + public static final Field UNUSEDBIT_22_8 = Field.create("UNUSEDBIT_22_8", 136, FieldType.BIT, 8); + public static final Field UNUSEDBIT_22_9 = Field.create("UNUSEDBIT_22_9", 136, FieldType.BIT, 9); + public static final Field UNUSEDBIT_22_10 = Field.create("UNUSEDBIT_22_10", 136, FieldType.BIT, 10); + public static final Field UNUSEDBIT_22_11 = Field.create("UNUSEDBIT_22_11", 136, FieldType.BIT, 11); + public static final Field UNUSEDBIT_22_12 = Field.create("UNUSEDBIT_22_12", 136, FieldType.BIT, 12); + public static final Field UNUSEDBIT_22_13 = Field.create("UNUSEDBIT_22_13", 136, FieldType.BIT, 13); + public static final Field UNUSEDBIT_22_14 = Field.create("UNUSEDBIT_22_14", 136, FieldType.BIT, 14); + public static final Field UNUSEDBIT_22_15 = Field.create("UNUSEDBIT_22_15", 136, FieldType.BIT, 15); + public static final Field UNUSEDBIT_22_16 = Field.create("UNUSEDBIT_22_16", 136, FieldType.BIT, 16); + public static final Field UNUSEDBIT_22_17 = Field.create("UNUSEDBIT_22_17", 136, FieldType.BIT, 17); + public static final Field UNUSEDBIT_22_18 = Field.create("UNUSEDBIT_22_18", 136, FieldType.BIT, 18); + public static final Field UNUSEDBIT_22_19 = Field.create("UNUSEDBIT_22_19", 136, FieldType.BIT, 19); + public static final Field UNUSEDBIT_22_20 = Field.create("UNUSEDBIT_22_20", 136, FieldType.BIT, 20); + public static final Field UNUSEDBIT_22_21 = Field.create("UNUSEDBIT_22_21", 136, FieldType.BIT, 21); + public static final Field UNUSEDBIT_22_22 = Field.create("UNUSEDBIT_22_22", 136, FieldType.BIT, 22); + public static final Field UNUSEDBIT_22_23 = Field.create("UNUSEDBIT_22_23", 136, FieldType.BIT, 23); + public static final Field UNUSEDBIT_22_24 = Field.create("UNUSEDBIT_22_24", 136, FieldType.BIT, 24); + public static final Field UNUSEDBIT_22_25 = Field.create("UNUSEDBIT_22_25", 136, FieldType.BIT, 25); + public static final Field UNUSEDBIT_22_26 = Field.create("UNUSEDBIT_22_26", 136, FieldType.BIT, 26); + public static final Field UNUSEDBIT_22_27 = Field.create("UNUSEDBIT_22_27", 136, FieldType.BIT, 27); + public static final Field UNUSEDBIT_22_28 = Field.create("UNUSEDBIT_22_28", 136, FieldType.BIT, 28); + public static final Field UNUSEDBIT_22_29 = Field.create("UNUSEDBIT_22_29", 136, FieldType.BIT, 29); + public static final Field UNUSEDBIT_22_30 = Field.create("UNUSEDBIT_22_30", 136, FieldType.BIT, 30); + public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 136, FieldType.BIT, 31); public static final Field[] VALUES = { LUA_FUELADD, + LUA_FUELMULT, LUA_CLUTCHUPSTATE, LUA_BRAKEPEDALSTATE, - LUA_UNUSEDBIT_3_2, - LUA_UNUSEDBIT_3_3, - LUA_UNUSEDBIT_3_4, - LUA_UNUSEDBIT_3_5, - LUA_UNUSEDBIT_3_6, - LUA_UNUSEDBIT_3_7, - LUA_UNUSEDBIT_3_8, - LUA_UNUSEDBIT_3_9, - LUA_UNUSEDBIT_3_10, - LUA_UNUSEDBIT_3_11, - LUA_UNUSEDBIT_3_12, - LUA_UNUSEDBIT_3_13, - LUA_UNUSEDBIT_3_14, - LUA_UNUSEDBIT_3_15, - LUA_UNUSEDBIT_3_16, - LUA_UNUSEDBIT_3_17, - LUA_UNUSEDBIT_3_18, - LUA_UNUSEDBIT_3_19, - LUA_UNUSEDBIT_3_20, - LUA_UNUSEDBIT_3_21, - LUA_UNUSEDBIT_3_22, - LUA_UNUSEDBIT_3_23, - LUA_UNUSEDBIT_3_24, - LUA_UNUSEDBIT_3_25, - LUA_UNUSEDBIT_3_26, - LUA_UNUSEDBIT_3_27, - LUA_UNUSEDBIT_3_28, - LUA_UNUSEDBIT_3_29, - LUA_UNUSEDBIT_3_30, - LUA_UNUSEDBIT_3_31, + LUA_UNUSEDBIT_4_2, + LUA_UNUSEDBIT_4_3, + LUA_UNUSEDBIT_4_4, + LUA_UNUSEDBIT_4_5, + LUA_UNUSEDBIT_4_6, + LUA_UNUSEDBIT_4_7, + LUA_UNUSEDBIT_4_8, + LUA_UNUSEDBIT_4_9, + LUA_UNUSEDBIT_4_10, + LUA_UNUSEDBIT_4_11, + LUA_UNUSEDBIT_4_12, + LUA_UNUSEDBIT_4_13, + LUA_UNUSEDBIT_4_14, + LUA_UNUSEDBIT_4_15, + LUA_UNUSEDBIT_4_16, + LUA_UNUSEDBIT_4_17, + LUA_UNUSEDBIT_4_18, + LUA_UNUSEDBIT_4_19, + LUA_UNUSEDBIT_4_20, + LUA_UNUSEDBIT_4_21, + LUA_UNUSEDBIT_4_22, + LUA_UNUSEDBIT_4_23, + LUA_UNUSEDBIT_4_24, + LUA_UNUSEDBIT_4_25, + LUA_UNUSEDBIT_4_26, + LUA_UNUSEDBIT_4_27, + LUA_UNUSEDBIT_4_28, + LUA_UNUSEDBIT_4_29, + LUA_UNUSEDBIT_4_30, + LUA_UNUSEDBIT_4_31, SD_ISTCHARGEAIRMODEL, SD_UNUSEDBIT_1_1, SD_UNUSEDBIT_1_2, 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 41e5c25e1d..411303014f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 03:38:24 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jun 30 17:53:47 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -2371,10 +2371,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.06.30.all.3625456876"; + public static final String TS_SIGNATURE = "rusEFI 2022.06.30.all.3749040373"; 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 = 1012; + public static final int TS_TOTAL_OUTPUT_SIZE = 1016; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3;