diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 5db5571d42..5f1789bc2a 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -455,7 +455,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -493,6 +492,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 19b3576770..415d61fc17 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -49,12 +49,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -105,6 +99,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/console/binary/generated/fancy_menu.ini b/firmware/console/binary/generated/fancy_menu.ini index 58d431175c..fb21fb4709 100644 --- a/firmware/console/binary/generated/fancy_menu.ini +++ b/firmware/console/binary/generated/fancy_menu.ini @@ -1,7 +1,7 @@ subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" diff --git a/firmware/console/binary/generated/live_data_fragments.h b/firmware/console/binary/generated/live_data_fragments.h index 67a9a6afe1..06992914c4 100644 --- a/firmware/console/binary/generated/live_data_fragments.h +++ b/firmware/console/binary/generated/live_data_fragments.h @@ -2,8 +2,8 @@ decl_frag{}, decl_frag{}, decl_frag{}, -decl_frag{}, decl_frag{}, +decl_frag{}, decl_frag{}, decl_frag{}, decl_frag{}, diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 1920a97392..b2070744af 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -6,8 +6,8 @@ typedef enum { LDS_output_channels, LDS_fuel_computer, LDS_ignition_state, -LDS_prime_injection, LDS_knock_controller, +LDS_prime_injection, LDS_tcu_controller, LDS_throttle_model, LDS_high_pressure_fuel_pump, @@ -45,8 +45,8 @@ LDS_lambda_monitor, #define OUTPUT_CHANNELS_BASE_ADDRESS 0 #define FUEL_COMPUTER_BASE_ADDRESS 860 #define IGNITION_STATE_BASE_ADDRESS 912 -#define PRIME_INJECTION_BASE_ADDRESS 956 -#define KNOCK_CONTROLLER_BASE_ADDRESS 960 +#define KNOCK_CONTROLLER_BASE_ADDRESS 956 +#define PRIME_INJECTION_BASE_ADDRESS 1064 #define TCU_CONTROLLER_BASE_ADDRESS 1068 #define THROTTLE_MODEL_BASE_ADDRESS 1084 #define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 1096 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index b93245b115..7f48c9e25e 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -512,45 +512,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 532306b8f1..2c5529584f 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -406,43 +406,43 @@ alignmentFill_at_26("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, Field dwellVoltageCorrection("Ign: Dwell voltage correction", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), luaTimingAdd("Ign: Lua timing add", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -20.0, 20.0, "deg"), luaTimingMult("Ign: Lua timing mult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -20.0, 20.0, "deg"), -m_knockLevel("Knock: Current level", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, 0.0, 0.0, "Volts"), -m_knockCyl1("Knock: Cyl 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 964, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl2("Knock: Cyl 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 965, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl3("Knock: Cyl 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 966, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl4("Knock: Cyl 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 967, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl5("Knock: Cyl 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 968, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl6("Knock: Cyl 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 969, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl7("Knock: Cyl 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 970, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl8("Knock: Cyl 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 971, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl9("Knock: Cyl 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 972, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl10("Knock: Cyl 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 973, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl11("Knock: Cyl 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 974, 1.0, 0.0, 0.0, "dBv"), -m_knockCyl12("Knock: Cyl 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 975, 1.0, 0.0, 0.0, "dBv"), -m_knockRetard("Knock: Retard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, 0.0, 0.0, "deg"), -m_knockThreshold("Knock: Threshold", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), -m_knockCount("Knock: Count", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, 0.0, 0.0, ""), -m_maximumRetard("Knock: Max retard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), -m_knockSpectrum1("Knock: SpectrumData 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum2("Knock: SpectrumData 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum3("Knock: SpectrumData 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum4("Knock: SpectrumData 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum5("Knock: SpectrumData 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum6("Knock: SpectrumData 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum7("Knock: SpectrumData 7", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum8("Knock: SpectrumData 8", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum9("Knock: SpectrumData 9", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1024, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum10("Knock: SpectrumData 10", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1028, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum11("Knock: SpectrumData 11", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1032, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum12("Knock: SpectrumData 12", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1036, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum13("Knock: SpectrumData 13", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum14("Knock: SpectrumData 14", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1044, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum15("Knock: SpectrumData 15", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrum16("Knock: SpectrumData 16", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1052, 1.0, 0.0, 0.0, "compressed data"), -m_knockSpectrumChannelCyl("Knock: ChannelAndCylNumber", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1056, 1.0, 0.0, 0.0, "compressed N + N"), -m_knockFrequencyStart("Knock: Start Freq", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1058, 1.0, 0.0, 0.0, "Hz"), -m_knockFrequencyStep("Knock: Step Freq", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1060, 1.0, 0.0, 0.0, "Hz"), -m_knockFuelTrimMultiplier("Knock: Fuel trim when knock", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1064, 1.0, 0.0, 0.0, "multiplier"), +m_knockLevel("Knock: Current level", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, 0.0, 0.0, "Volts"), +m_knockCyl1("Knock: Cyl 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 960, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl2("Knock: Cyl 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 961, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl3("Knock: Cyl 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 962, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl4("Knock: Cyl 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 963, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl5("Knock: Cyl 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 964, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl6("Knock: Cyl 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 965, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl7("Knock: Cyl 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 966, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl8("Knock: Cyl 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 967, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl9("Knock: Cyl 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 968, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl10("Knock: Cyl 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 969, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl11("Knock: Cyl 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 970, 1.0, 0.0, 0.0, "dBv"), +m_knockCyl12("Knock: Cyl 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 971, 1.0, 0.0, 0.0, "dBv"), +m_knockRetard("Knock: Retard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, 0.0, 0.0, "deg"), +m_knockThreshold("Knock: Threshold", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -1.0, -1.0, ""), +m_knockCount("Knock: Count", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, 0.0, 0.0, ""), +m_maximumRetard("Knock: Max retard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), +m_knockSpectrum1("Knock: SpectrumData 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum2("Knock: SpectrumData 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum3("Knock: SpectrumData 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum4("Knock: SpectrumData 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum5("Knock: SpectrumData 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum6("Knock: SpectrumData 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum7("Knock: SpectrumData 7", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum8("Knock: SpectrumData 8", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum9("Knock: SpectrumData 9", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum10("Knock: SpectrumData 10", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1024, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum11("Knock: SpectrumData 11", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1028, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum12("Knock: SpectrumData 12", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1032, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum13("Knock: SpectrumData 13", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1036, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum14("Knock: SpectrumData 14", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum15("Knock: SpectrumData 15", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1044, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrum16("Knock: SpectrumData 16", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, 0.0, 0.0, "compressed data"), +m_knockSpectrumChannelCyl("Knock: ChannelAndCylNumber", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1052, 1.0, 0.0, 0.0, "compressed N + N"), +m_knockFrequencyStart("Knock: Start Freq", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1054, 1.0, 0.0, 0.0, "Hz"), +m_knockFrequencyStep("Knock: Step Freq", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1056, 1.0, 0.0, 0.0, "Hz"), +m_knockFuelTrimMultiplier("Knock: Fuel trim when knock", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1060, 1.0, 0.0, 0.0, "multiplier"), tcuCurrentGear("TCU: Current Gear", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1068, 1.0, -1.0, 10.0, "gear"), alignmentFill_at_1("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1069, 1.0, -20.0, 100.0, "units"), tcRatio("TCU: Torque Converter Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1070, 0.01, 0.0, 0.0, "value"), diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 49904b7612..1791e4056a 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1333,7 +1333,7 @@ #define show_2chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3377165025 +#define SIGNATURE_HASH 1752384059 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-2chan.3377165025" +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-2chan.1752384059" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index aaf4f589aa..2f6f4b8662 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1334,7 +1334,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2161345896 +#define SIGNATURE_HASH 569095602 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1802,7 +1802,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4chan.2161345896" +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4chan.569095602" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index c287e5c9ae..f86d31e7a7 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1334,7 +1334,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2161345896 +#define SIGNATURE_HASH 569095602 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1802,7 +1802,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4chan_f7.2161345896" +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4chan_f7.569095602" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h index 0ce101a5db..d3a98e729b 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4000667518 +#define SIGNATURE_HASH 1330472868 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4k-gdi.4000667518" +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4k-gdi.1330472868" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index 78842ed07c..0429790ba6 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1333,7 +1333,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4289513157 +#define SIGNATURE_HASH 1586820639 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan-revA.4289513157" +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan-revA.1586820639" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index 2f1319e5e3..485aecd6b1 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1331,7 +1331,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 988287613 +#define SIGNATURE_HASH 2614108839 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1799,7 +1799,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan.988287613" +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan.2614108839" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 464c29ec6b..7f9c1b07fd 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1331,7 +1331,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 988287613 +#define SIGNATURE_HASH 2614108839 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1799,7 +1799,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan_f7.988287613" +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan_f7.2614108839" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-silver.h b/firmware/controllers/generated/rusefi_generated_alphax-silver.h index fb24d8e526..e105bb5e81 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-silver.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-silver.h @@ -1332,7 +1332,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3384978143 +#define SIGNATURE_HASH 1761253893 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1800,7 +1800,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-silver.3384978143" +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-silver.1761253893" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index 7b39541acf..efdd6b10e8 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 116271253 +#define SIGNATURE_HASH 2815825999 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.at_start_f435.116271253" +#define TS_SIGNATURE "rusEFI master.2024.12.23.at_start_f435.2815825999" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index 72c0f623d4..9722e300da 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1122630875 +#define SIGNATURE_HASH 3822177281 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.atlas.1122630875" +#define TS_SIGNATURE "rusEFI master.2024.12.23.atlas.3822177281" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 7d8fcc0ab9..6ebb860ebd 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1336,7 +1336,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 3864453416 +#define SIGNATURE_HASH 1198445042 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.f407-discovery.3864453416" +#define TS_SIGNATURE "rusEFI master.2024.12.23.f407-discovery.1198445042" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index 1992442f65..b9c92a30a5 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 116271253 +#define SIGNATURE_HASH 2815825999 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.f429-discovery.116271253" +#define TS_SIGNATURE "rusEFI master.2024.12.23.f429-discovery.2815825999" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index dcc1ea6298..eabe1eeff2 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 876162566 +#define SIGNATURE_HASH 2499878620 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.f469-discovery.876162566" +#define TS_SIGNATURE "rusEFI master.2024.12.23.f469-discovery.2499878620" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index 6b88acd8b4..ec3baa0610 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1337,7 +1337,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 1349344398 +#define SIGNATURE_HASH 4048907348 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.frankenso_na6.1349344398" +#define TS_SIGNATURE "rusEFI master.2024.12.23.frankenso_na6.4048907348" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index d46dd443bd..88ed3f8c5b 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 116271253 +#define SIGNATURE_HASH 2815825999 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.haba208.116271253" +#define TS_SIGNATURE "rusEFI master.2024.12.23.haba208.2815825999" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index 25a850d752..592f1c6a48 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1336,7 +1336,7 @@ #define show_8chan_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2414260241 +#define SIGNATURE_HASH 786333899 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-112-17.2414260241" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-112-17.786333899" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index 4d40871f5e..dfea0ace6d 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3398913837 +#define SIGNATURE_HASH 1806663671 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-gm-e67.3398913837" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-gm-e67.1806663671" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index 4c07f74765..4bd687e40c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1389845219 +#define SIGNATURE_HASH 4092553785 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-honda-k.1389845219" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-honda-k.4092553785" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index 80225f56a3..6be08bc478 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1336,7 +1336,7 @@ #define show_HellenNB1_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2236153226 +#define SIGNATURE_HASH 611372368 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-nb1.2236153226" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-nb1.611372368" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 01f29b4903..eadf2d71d7 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1336,7 +1336,7 @@ #define show_Hellen121nissan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3598039573 +#define SIGNATURE_HASH 2001570511 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen121nissan.3598039573" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen121nissan.2001570511" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index d79ea75395..a2f5c1af8a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1336,7 +1336,7 @@ #define show_Hellen121vag_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2384242770 +#define SIGNATURE_HASH 790927496 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen121vag.2384242770" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen121vag.790927496" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index 558bc489f5..9da9cf9e06 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1336,7 +1336,7 @@ #define show_Hellen128merc_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3950772834 +#define SIGNATURE_HASH 1245983416 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen128.3950772834" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen128.1245983416" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index a041df89e8..86a314f862 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3830704541 +#define SIGNATURE_HASH 1164695879 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen154hyundai.3830704541" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen154hyundai.1164695879" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index c3742c269a..1bc0441942 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 386690831 +#define SIGNATURE_HASH 3056885717 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen154hyundai_f7.386690831" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen154hyundai_f7.3056885717" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index aecec94d26..a7f0db2fab 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1336,7 +1336,7 @@ #define show_HellenNB2_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4224107843 +#define SIGNATURE_HASH 1526658457 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen72.4224107843" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen72.1526658457" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index 50d891cdbb..765e7e5225 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1669249139 +#define SIGNATURE_HASH 3259402409 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen81.1669249139" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen81.3259402409" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 19d196f8ba..76e3cd3879 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1336,7 +1336,7 @@ #define show_Hellen88bmw_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1952296240 +#define SIGNATURE_HASH 3580206570 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen88bmw.1952296240" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen88bmw.3580206570" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 8d0ec27e39..77de348ba5 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1336,7 +1336,7 @@ #define show_HellenNA6_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2454440821 +#define SIGNATURE_HASH 863239087 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellenNA6.2454440821" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellenNA6.863239087" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 9c670f5d7f..f1dd448ada 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1337,7 +1337,7 @@ #define show_HellenNB1_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1838254523 +#define SIGNATURE_HASH 3433675105 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellenNA8_96.1838254523" +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellenNA8_96.3433675105" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 28ae1783b9..1d0fe2e9d3 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1627220746 +#define SIGNATURE_HASH 3250936784 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.m74_9.1627220746" +#define TS_SIGNATURE "rusEFI master.2024.12.23.m74_9.3250936784" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h index 954f3f97cb..c7e9063ebc 100644 --- a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h @@ -1334,7 +1334,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1301342550 +#define SIGNATURE_HASH 3970488716 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1802,7 +1802,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.mre-legacy_f4.1301342550" +#define TS_SIGNATURE "rusEFI master.2024.12.23.mre-legacy_f4.3970488716" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index e3c61e983b..93a4fb7db6 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1334,7 +1334,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1301342550 +#define SIGNATURE_HASH 3970488716 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1802,7 +1802,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.mre_f4.1301342550" +#define TS_SIGNATURE "rusEFI master.2024.12.23.mre_f4.3970488716" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 0fd661d634..df68046b39 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1334,7 +1334,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1301342550 +#define SIGNATURE_HASH 3970488716 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1802,7 +1802,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.mre_f7.1301342550" +#define TS_SIGNATURE "rusEFI master.2024.12.23.mre_f7.3970488716" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index 99efb00d12..375d38ce67 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 116271253 +#define SIGNATURE_HASH 2815825999 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.nucleo_f413.116271253" +#define TS_SIGNATURE "rusEFI master.2024.12.23.nucleo_f413.2815825999" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index 2831b06992..ce4f631052 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1796110805 +#define SIGNATURE_HASH 3392555279 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_f4.1796110805" +#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_f4.3392555279" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index 6c7ac79936..52800ead3b 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1796110805 +#define SIGNATURE_HASH 3392555279 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_f7.1796110805" +#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_f7.3392555279" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index 462df747c1..6fb71770d8 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1796110805 +#define SIGNATURE_HASH 3392555279 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_h7.1796110805" +#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_h7.3392555279" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index 92a3d9bcd3..3a5caa2f69 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3110447191 +#define SIGNATURE_HASH 408787085 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.s105.3110447191" +#define TS_SIGNATURE "rusEFI master.2024.12.23.s105.408787085" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index bd5741fc13..b5d6dbafc2 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1511327160 +#define SIGNATURE_HASH 4214044002 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1802,7 +1802,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.small-can-board.1511327160" +#define TS_SIGNATURE "rusEFI master.2024.12.23.small-can-board.4214044002" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 8c66b8f907..45111aa304 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 116271253 +#define SIGNATURE_HASH 2815825999 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32f429_nucleo.116271253" +#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32f429_nucleo.2815825999" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index eef0f5d0b5..38c1344d51 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 116271253 +#define SIGNATURE_HASH 2815825999 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32f767_nucleo.116271253" +#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32f767_nucleo.2815825999" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index 39c88ed7a6..69d9c35e67 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 116271253 +#define SIGNATURE_HASH 2815825999 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32h743_nucleo.116271253" +#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32h743_nucleo.2815825999" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h index 0d013bf269..b6886d3950 100644 --- a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1506742475 +#define SIGNATURE_HASH 4176945169 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.subaru_eg33_f7.1506742475" +#define TS_SIGNATURE "rusEFI master.2024.12.23.subaru_eg33_f7.4176945169" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index edaca5f77a..ff65de55f5 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 116271253 +#define SIGNATURE_HASH 2815825999 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.t-b-g.116271253" +#define TS_SIGNATURE "rusEFI master.2024.12.23.t-b-g.2815825999" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index 626d4b67dc..ada61cd5a8 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1019450397 +#define SIGNATURE_HASH 2650514631 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.tdg-pdm8.1019450397" +#define TS_SIGNATURE "rusEFI master.2024.12.23.tdg-pdm8.2650514631" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 35e3540d7c..6ac2a79f28 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1329,7 +1329,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 112699014 +#define SIGNATURE_HASH 2811205212 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1798,7 +1798,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.uaefi.112699014" +#define TS_SIGNATURE "rusEFI master.2024.12.23.uaefi.2811205212" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi121.h b/firmware/controllers/generated/rusefi_generated_uaefi121.h index 0a4437a3b3..c4490f0252 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi121.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi121.h @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4034551275 +#define SIGNATURE_HASH 1363307825 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1801,7 +1801,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.12.23.uaefi121.4034551275" +#define TS_SIGNATURE "rusEFI master.2024.12.23.uaefi121.1363307825" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 0ceee1f621..4667e884d7 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3377165025 -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-2chan.3377165025" +#define SIGNATURE_HASH 1752384059 +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-2chan.1752384059" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 1540384731..90a0c28c26 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2161345896 -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4chan.2161345896" +#define SIGNATURE_HASH 569095602 +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4chan.569095602" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index baa2080c88..20bae2a2dd 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2161345896 -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4chan_f7.2161345896" +#define SIGNATURE_HASH 569095602 +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4chan_f7.569095602" diff --git a/firmware/controllers/generated/signature_alphax-4k-gdi.h b/firmware/controllers/generated/signature_alphax-4k-gdi.h index 274fed0f61..50fa22a73a 100644 --- a/firmware/controllers/generated/signature_alphax-4k-gdi.h +++ b/firmware/controllers/generated/signature_alphax-4k-gdi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4000667518 -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4k-gdi.4000667518" +#define SIGNATURE_HASH 1330472868 +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-4k-gdi.1330472868" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 908f495569..e3f445ad13 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4289513157 -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan-revA.4289513157" +#define SIGNATURE_HASH 1586820639 +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan-revA.1586820639" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 6598acaa89..88d63c94c7 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 988287613 -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan.988287613" +#define SIGNATURE_HASH 2614108839 +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan.2614108839" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index dbb3c0743f..1904907a55 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 988287613 -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan_f7.988287613" +#define SIGNATURE_HASH 2614108839 +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-8chan_f7.2614108839" diff --git a/firmware/controllers/generated/signature_alphax-silver.h b/firmware/controllers/generated/signature_alphax-silver.h index acffb7bed0..715f10984b 100644 --- a/firmware/controllers/generated/signature_alphax-silver.h +++ b/firmware/controllers/generated/signature_alphax-silver.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3384978143 -#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-silver.3384978143" +#define SIGNATURE_HASH 1761253893 +#define TS_SIGNATURE "rusEFI master.2024.12.23.alphax-silver.1761253893" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 1d427c0145..8a12dd25cd 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116271253 -#define TS_SIGNATURE "rusEFI master.2024.12.23.at_start_f435.116271253" +#define SIGNATURE_HASH 2815825999 +#define TS_SIGNATURE "rusEFI master.2024.12.23.at_start_f435.2815825999" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index bcb3fdbf79..80e50ec7be 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1122630875 -#define TS_SIGNATURE "rusEFI master.2024.12.23.atlas.1122630875" +#define SIGNATURE_HASH 3822177281 +#define TS_SIGNATURE "rusEFI master.2024.12.23.atlas.3822177281" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index d2b9169f24..39292171b1 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3864453416 -#define TS_SIGNATURE "rusEFI master.2024.12.23.f407-discovery.3864453416" +#define SIGNATURE_HASH 1198445042 +#define TS_SIGNATURE "rusEFI master.2024.12.23.f407-discovery.1198445042" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 406bf7b4ef..3cd85f46ac 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116271253 -#define TS_SIGNATURE "rusEFI master.2024.12.23.f429-discovery.116271253" +#define SIGNATURE_HASH 2815825999 +#define TS_SIGNATURE "rusEFI master.2024.12.23.f429-discovery.2815825999" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index 63aae6fa60..2645b4e390 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 876162566 -#define TS_SIGNATURE "rusEFI master.2024.12.23.f469-discovery.876162566" +#define SIGNATURE_HASH 2499878620 +#define TS_SIGNATURE "rusEFI master.2024.12.23.f469-discovery.2499878620" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index ca077f0d57..dce50e48f1 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1349344398 -#define TS_SIGNATURE "rusEFI master.2024.12.23.frankenso_na6.1349344398" +#define SIGNATURE_HASH 4048907348 +#define TS_SIGNATURE "rusEFI master.2024.12.23.frankenso_na6.4048907348" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index 8b4db75952..82fb30928f 100644 --- a/firmware/controllers/generated/signature_haba208.h +++ b/firmware/controllers/generated/signature_haba208.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116271253 -#define TS_SIGNATURE "rusEFI master.2024.12.23.haba208.116271253" +#define SIGNATURE_HASH 2815825999 +#define TS_SIGNATURE "rusEFI master.2024.12.23.haba208.2815825999" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index cddeed1224..42328fe525 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2414260241 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-112-17.2414260241" +#define SIGNATURE_HASH 786333899 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-112-17.786333899" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 8f827dedfd..e2f14a3c53 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3398913837 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-gm-e67.3398913837" +#define SIGNATURE_HASH 1806663671 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-gm-e67.1806663671" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 5609125706..bfdb3b7d47 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1389845219 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-honda-k.1389845219" +#define SIGNATURE_HASH 4092553785 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-honda-k.4092553785" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index a10f0b4d83..2695ae4e84 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2236153226 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-nb1.2236153226" +#define SIGNATURE_HASH 611372368 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen-nb1.611372368" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 821b9c8177..d5836586c2 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3598039573 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen121nissan.3598039573" +#define SIGNATURE_HASH 2001570511 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen121nissan.2001570511" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index b46e2af9a0..e2f2d34a84 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2384242770 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen121vag.2384242770" +#define SIGNATURE_HASH 790927496 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen121vag.790927496" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 83b42c470b..404dece466 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3950772834 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen128.3950772834" +#define SIGNATURE_HASH 1245983416 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen128.1245983416" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 2a0ac7e7d4..a64849b6fc 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3830704541 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen154hyundai.3830704541" +#define SIGNATURE_HASH 1164695879 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen154hyundai.1164695879" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index a17ef74a77..f4c4532a61 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/signature_hellen154hyundai_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 386690831 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen154hyundai_f7.386690831" +#define SIGNATURE_HASH 3056885717 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen154hyundai_f7.3056885717" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index d1b7b87a15..6f5130ecdd 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4224107843 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen72.4224107843" +#define SIGNATURE_HASH 1526658457 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen72.1526658457" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 35ac5c9b45..a33d7909ec 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1669249139 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen81.1669249139" +#define SIGNATURE_HASH 3259402409 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen81.3259402409" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 895dd7dff5..ef1a4e5f57 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1952296240 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen88bmw.1952296240" +#define SIGNATURE_HASH 3580206570 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellen88bmw.3580206570" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 440da456e3..142ae0453a 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2454440821 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellenNA6.2454440821" +#define SIGNATURE_HASH 863239087 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellenNA6.863239087" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 050c324666..6b351eb1df 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1838254523 -#define TS_SIGNATURE "rusEFI master.2024.12.23.hellenNA8_96.1838254523" +#define SIGNATURE_HASH 3433675105 +#define TS_SIGNATURE "rusEFI master.2024.12.23.hellenNA8_96.3433675105" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 5399de71d3..d252be852b 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1627220746 -#define TS_SIGNATURE "rusEFI master.2024.12.23.m74_9.1627220746" +#define SIGNATURE_HASH 3250936784 +#define TS_SIGNATURE "rusEFI master.2024.12.23.m74_9.3250936784" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index 55a9216896..d494ad83c1 100644 --- a/firmware/controllers/generated/signature_mre-legacy_f4.h +++ b/firmware/controllers/generated/signature_mre-legacy_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1301342550 -#define TS_SIGNATURE "rusEFI master.2024.12.23.mre-legacy_f4.1301342550" +#define SIGNATURE_HASH 3970488716 +#define TS_SIGNATURE "rusEFI master.2024.12.23.mre-legacy_f4.3970488716" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index bb857a027f..69889f1bd4 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1301342550 -#define TS_SIGNATURE "rusEFI master.2024.12.23.mre_f4.1301342550" +#define SIGNATURE_HASH 3970488716 +#define TS_SIGNATURE "rusEFI master.2024.12.23.mre_f4.3970488716" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 47f4259284..8d39ba17ef 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1301342550 -#define TS_SIGNATURE "rusEFI master.2024.12.23.mre_f7.1301342550" +#define SIGNATURE_HASH 3970488716 +#define TS_SIGNATURE "rusEFI master.2024.12.23.mre_f7.3970488716" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index 233416b07a..00521b808c 100644 --- a/firmware/controllers/generated/signature_nucleo_f413.h +++ b/firmware/controllers/generated/signature_nucleo_f413.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116271253 -#define TS_SIGNATURE "rusEFI master.2024.12.23.nucleo_f413.116271253" +#define SIGNATURE_HASH 2815825999 +#define TS_SIGNATURE "rusEFI master.2024.12.23.nucleo_f413.2815825999" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 85ad77e913..f5993f6553 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1796110805 -#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_f4.1796110805" +#define SIGNATURE_HASH 3392555279 +#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_f4.3392555279" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 4334ff3486..3b8b471885 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1796110805 -#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_f7.1796110805" +#define SIGNATURE_HASH 3392555279 +#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_f7.3392555279" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 9410f62805..7acb6dd73a 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1796110805 -#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_h7.1796110805" +#define SIGNATURE_HASH 3392555279 +#define TS_SIGNATURE "rusEFI master.2024.12.23.proteus_h7.3392555279" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index e6bda3e930..791b7a6b34 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3110447191 -#define TS_SIGNATURE "rusEFI master.2024.12.23.s105.3110447191" +#define SIGNATURE_HASH 408787085 +#define TS_SIGNATURE "rusEFI master.2024.12.23.s105.408787085" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index ee630b0de1..faeb341524 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1511327160 -#define TS_SIGNATURE "rusEFI master.2024.12.23.small-can-board.1511327160" +#define SIGNATURE_HASH 4214044002 +#define TS_SIGNATURE "rusEFI master.2024.12.23.small-can-board.4214044002" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 94b82d56b3..1de18df5e5 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116271253 -#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32f429_nucleo.116271253" +#define SIGNATURE_HASH 2815825999 +#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32f429_nucleo.2815825999" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index f940ab889d..9559fd3c61 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116271253 -#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32f767_nucleo.116271253" +#define SIGNATURE_HASH 2815825999 +#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32f767_nucleo.2815825999" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index 93ae2151f3..f41c535fc7 100644 --- a/firmware/controllers/generated/signature_stm32h743_nucleo.h +++ b/firmware/controllers/generated/signature_stm32h743_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116271253 -#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32h743_nucleo.116271253" +#define SIGNATURE_HASH 2815825999 +#define TS_SIGNATURE "rusEFI master.2024.12.23.stm32h743_nucleo.2815825999" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index c2fb752648..e4737ed294 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1506742475 -#define TS_SIGNATURE "rusEFI master.2024.12.23.subaru_eg33_f7.1506742475" +#define SIGNATURE_HASH 4176945169 +#define TS_SIGNATURE "rusEFI master.2024.12.23.subaru_eg33_f7.4176945169" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index ef03ada083..08de2b692c 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116271253 -#define TS_SIGNATURE "rusEFI master.2024.12.23.t-b-g.116271253" +#define SIGNATURE_HASH 2815825999 +#define TS_SIGNATURE "rusEFI master.2024.12.23.t-b-g.2815825999" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 66e5e2d8ab..245e54565c 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1019450397 -#define TS_SIGNATURE "rusEFI master.2024.12.23.tdg-pdm8.1019450397" +#define SIGNATURE_HASH 2650514631 +#define TS_SIGNATURE "rusEFI master.2024.12.23.tdg-pdm8.2650514631" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index ca817a3ac4..e05314d88f 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 112699014 -#define TS_SIGNATURE "rusEFI master.2024.12.23.uaefi.112699014" +#define SIGNATURE_HASH 2811205212 +#define TS_SIGNATURE "rusEFI master.2024.12.23.uaefi.2811205212" diff --git a/firmware/controllers/generated/signature_uaefi121.h b/firmware/controllers/generated/signature_uaefi121.h index e7533fc39f..c0cb09936a 100644 --- a/firmware/controllers/generated/signature_uaefi121.h +++ b/firmware/controllers/generated/signature_uaefi121.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4034551275 -#define TS_SIGNATURE "rusEFI master.2024.12.23.uaefi121.4034551275" +#define SIGNATURE_HASH 1363307825 +#define TS_SIGNATURE "rusEFI master.2024.12.23.uaefi121.1363307825" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 9db2586ab9..77842ed9b0 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -955,9 +955,6 @@ float getOutputValueByName(const char *name) { // luaIgnitionSkip case -1916613921: return engine->ignitionState.luaIgnitionSkip; -// m_isPriming - case -612624925: - return ___engine.module()->m_isPriming; // m_knockLevel case -1571781441: return ___engine.module()->m_knockLevel; @@ -985,6 +982,9 @@ float getOutputValueByName(const char *name) { // m_knockFuelTrimMultiplier case 95716118: return ___engine.module()->m_knockFuelTrimMultiplier; +// m_isPriming + case -612624925: + return ___engine.module()->m_isPriming; // m_deadtime #if EFI_PROD_CODE && EFI_IDLE_CONTROL case -1167844818: diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index d49a5c6d43..dfb3c29fa5 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.f407-discovery.3864453416" + signature = "rusEFI master.2024.12.23.f407-discovery.1198445042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.f407-discovery.3864453416" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.f407-discovery.1198445042" ; 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 @@ -3181,45 +3181,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5800,7 +5800,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5838,6 +5837,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6539,8 +6539,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6740,12 +6740,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6796,6 +6790,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index f618bc920d..4fed314ca4 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.alphax-2chan.3377165025" + signature = "rusEFI master.2024.12.23.alphax-2chan.1752384059" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.alphax-2chan.3377165025" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.alphax-2chan.1752384059" ; 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 @@ -3185,45 +3185,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5797,7 +5797,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5835,6 +5834,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6520,8 +6520,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6721,12 +6721,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6777,6 +6771,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 728d41e5bd..b36228fce3 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.alphax-4chan.2161345896" + signature = "rusEFI master.2024.12.23.alphax-4chan.569095602" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.alphax-4chan.2161345896" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.alphax-4chan.569095602" ; 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 @@ -3190,45 +3190,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5809,7 +5809,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5847,6 +5846,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6561,8 +6561,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6762,12 +6762,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6818,6 +6812,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 9f3174f23d..997480b726 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.alphax-4chan_f7.2161345896" + signature = "rusEFI master.2024.12.23.alphax-4chan_f7.569095602" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.alphax-4chan_f7.2161345896" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.alphax-4chan_f7.569095602" ; 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 @@ -3190,45 +3190,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5809,7 +5809,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5847,6 +5846,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6561,8 +6561,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6762,12 +6762,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6818,6 +6812,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini index 2709c02505..7aedb8cd6f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.alphax-4k-gdi.4000667518" + signature = "rusEFI master.2024.12.23.alphax-4k-gdi.1330472868" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.alphax-4k-gdi.4000667518" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.alphax-4k-gdi.1330472868" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5795,7 +5795,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5833,6 +5832,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6534,8 +6534,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6738,12 +6738,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6794,6 +6788,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index acf69dc156..b6f5dd833e 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.alphax-8chan-revA.4289513157" + signature = "rusEFI master.2024.12.23.alphax-8chan-revA.1586820639" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.alphax-8chan-revA.4289513157" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.alphax-8chan-revA.1586820639" ; 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 @@ -3185,45 +3185,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5803,7 +5803,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5841,6 +5840,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6537,8 +6537,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6738,12 +6738,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6794,6 +6788,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 14d532a177..a5e579aa8c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.alphax-8chan.988287613" + signature = "rusEFI master.2024.12.23.alphax-8chan.2614108839" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.alphax-8chan.988287613" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.alphax-8chan.2614108839" ; 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 @@ -3194,45 +3194,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5813,7 +5813,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5851,6 +5850,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6559,8 +6559,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6761,12 +6761,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6817,6 +6811,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 2e3d08d4f2..511ba35a0d 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.alphax-8chan_f7.988287613" + signature = "rusEFI master.2024.12.23.alphax-8chan_f7.2614108839" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.alphax-8chan_f7.988287613" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.alphax-8chan_f7.2614108839" ; 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 @@ -3194,45 +3194,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5813,7 +5813,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5851,6 +5850,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6559,8 +6559,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6761,12 +6761,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6817,6 +6811,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini index 3a1301ef90..a56944d4e3 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.alphax-silver.3384978143" + signature = "rusEFI master.2024.12.23.alphax-silver.1761253893" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.alphax-silver.3384978143" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.alphax-silver.1761253893" ; 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 @@ -3181,45 +3181,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5793,7 +5793,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5831,6 +5830,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6517,8 +6517,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6718,12 +6718,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6774,6 +6768,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 7e552793aa..df798a35f5 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.at_start_f435.116271253" + signature = "rusEFI master.2024.12.23.at_start_f435.2815825999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.at_start_f435.116271253" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.at_start_f435.2815825999" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index ba2dc19640..263c789128 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.atlas.1122630875" + signature = "rusEFI master.2024.12.23.atlas.3822177281" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.atlas.1122630875" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.atlas.3822177281" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index d49a5c6d43..dfb3c29fa5 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.f407-discovery.3864453416" + signature = "rusEFI master.2024.12.23.f407-discovery.1198445042" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.f407-discovery.3864453416" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.f407-discovery.1198445042" ; 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 @@ -3181,45 +3181,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5800,7 +5800,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5838,6 +5837,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6539,8 +6539,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6740,12 +6740,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6796,6 +6790,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 6f13a33af1..22879b1b49 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.f429-discovery.116271253" + signature = "rusEFI master.2024.12.23.f429-discovery.2815825999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.f429-discovery.116271253" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.f429-discovery.2815825999" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 3688d5a30c..aa501cc85a 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.f469-discovery.876162566" + signature = "rusEFI master.2024.12.23.f469-discovery.2499878620" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.f469-discovery.876162566" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.f469-discovery.2499878620" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8f73b2e60b..9af787c4cd 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.frankenso_na6.1349344398" + signature = "rusEFI master.2024.12.23.frankenso_na6.4048907348" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.frankenso_na6.1349344398" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.frankenso_na6.4048907348" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index 3ee26ea168..f0567911f4 100644 --- a/firmware/tunerstudio/generated/rusefi_haba208.ini +++ b/firmware/tunerstudio/generated/rusefi_haba208.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.haba208.116271253" + signature = "rusEFI master.2024.12.23.haba208.2815825999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.haba208.116271253" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.haba208.2815825999" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 5aea1b993d..d704e40b37 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen-112-17.2414260241" + signature = "rusEFI master.2024.12.23.hellen-112-17.786333899" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen-112-17.2414260241" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen-112-17.786333899" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6531,8 +6531,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6732,12 +6732,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6788,6 +6782,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 3dcefe02e7..871bc7fda9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen-gm-e67.3398913837" + signature = "rusEFI master.2024.12.23.hellen-gm-e67.1806663671" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen-gm-e67.3398913837" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen-gm-e67.1806663671" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6533,8 +6533,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6734,12 +6734,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6790,6 +6784,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index fca8080e33..81185c3d42 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -4,12 +4,12 @@ enable2ndByteCanID = false [SettingGroups] [MegaTune] - signature = "rusEFI master.2024.12.23.hellen-honda-k.1389845219" + signature = "rusEFI master.2024.12.23.hellen-honda-k.4092553785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen-honda-k.1389845219" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen-honda-k.4092553785" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -3113,45 +3113,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5652,7 +5652,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5690,6 +5689,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6367,8 +6367,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6553,12 +6553,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6609,6 +6603,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index aeadb24d72..7b8931eec5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen-nb1.2236153226" + signature = "rusEFI master.2024.12.23.hellen-nb1.611372368" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen-nb1.2236153226" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen-nb1.611372368" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6533,8 +6533,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6734,12 +6734,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6790,6 +6784,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index df4f9d3d66..62dfaf5931 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen121nissan.3598039573" + signature = "rusEFI master.2024.12.23.hellen121nissan.2001570511" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen121nissan.3598039573" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen121nissan.2001570511" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6530,8 +6530,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6731,12 +6731,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6787,6 +6781,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 3b653b85c8..1c1e9f0762 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen121vag.2384242770" + signature = "rusEFI master.2024.12.23.hellen121vag.790927496" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen121vag.2384242770" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen121vag.790927496" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 8e4754382c..a746dc10d2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen128.3950772834" + signature = "rusEFI master.2024.12.23.hellen128.1245983416" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen128.3950772834" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen128.1245983416" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6533,8 +6533,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6734,12 +6734,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6790,6 +6784,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 80285d3155..3ca6c28b78 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen154hyundai.3830704541" + signature = "rusEFI master.2024.12.23.hellen154hyundai.1164695879" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen154hyundai.3830704541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen154hyundai.1164695879" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5794,7 +5794,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5832,6 +5831,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6513,8 +6513,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6716,12 +6716,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6772,6 +6766,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index f8384b1ca5..c0035c8071 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen154hyundai_f7.386690831" + signature = "rusEFI master.2024.12.23.hellen154hyundai_f7.3056885717" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen154hyundai_f7.386690831" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen154hyundai_f7.3056885717" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5794,7 +5794,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5832,6 +5831,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6514,8 +6514,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6717,12 +6717,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6773,6 +6767,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 591284ad36..b198efdfe1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen72.4224107843" + signature = "rusEFI master.2024.12.23.hellen72.1526658457" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen72.4224107843" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen72.1526658457" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6533,8 +6533,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6734,12 +6734,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6790,6 +6784,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index db29e80c4f..a568b2ad1f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen81.1669249139" + signature = "rusEFI master.2024.12.23.hellen81.3259402409" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen81.1669249139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen81.3259402409" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6531,8 +6531,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6732,12 +6732,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6788,6 +6782,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index aab26a6b36..8c9c2eef4f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellen88bmw.1952296240" + signature = "rusEFI master.2024.12.23.hellen88bmw.3580206570" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellen88bmw.1952296240" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellen88bmw.3580206570" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6530,8 +6530,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6731,12 +6731,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6787,6 +6781,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 79040d4b27..f614b59228 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellenNA6.2454440821" + signature = "rusEFI master.2024.12.23.hellenNA6.863239087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellenNA6.2454440821" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellenNA6.863239087" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6533,8 +6533,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6734,12 +6734,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6790,6 +6784,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 38f8d957e0..47bc4ebd5e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.hellenNA8_96.1838254523" + signature = "rusEFI master.2024.12.23.hellenNA8_96.3433675105" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.hellenNA8_96.1838254523" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.hellenNA8_96.3433675105" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6533,8 +6533,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6734,12 +6734,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6790,6 +6784,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index fbad95f204..21f6531278 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.m74_9.1627220746" + signature = "rusEFI master.2024.12.23.m74_9.3250936784" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.m74_9.1627220746" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.m74_9.3250936784" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6535,8 +6535,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6736,12 +6736,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6792,6 +6786,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index b3c8b0901b..d43722fc56 100644 --- a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.mre-legacy_f4.1301342550" + signature = "rusEFI master.2024.12.23.mre-legacy_f4.3970488716" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.mre-legacy_f4.1301342550" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.mre-legacy_f4.3970488716" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5796,7 +5796,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5834,6 +5833,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6547,8 +6547,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6749,12 +6749,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6805,6 +6799,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index ae44b8d30f..0ac44b37fe 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.mre_f4.1301342550" + signature = "rusEFI master.2024.12.23.mre_f4.3970488716" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.mre_f4.1301342550" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.mre_f4.3970488716" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5796,7 +5796,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5834,6 +5833,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6547,8 +6547,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6749,12 +6749,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6805,6 +6799,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 0ab43e6698..554f0fa99e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.mre_f7.1301342550" + signature = "rusEFI master.2024.12.23.mre_f7.3970488716" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.mre_f7.1301342550" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.mre_f7.3970488716" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5796,7 +5796,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5834,6 +5833,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6547,8 +6547,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6749,12 +6749,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6805,6 +6799,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index 142dd6fd02..aab4687618 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.nucleo_f413.116271253" + signature = "rusEFI master.2024.12.23.nucleo_f413.2815825999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.nucleo_f413.116271253" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.nucleo_f413.2815825999" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 82a1cd9b11..71f93dd8d1 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.proteus_f4.1796110805" + signature = "rusEFI master.2024.12.23.proteus_f4.3392555279" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.proteus_f4.1796110805" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.proteus_f4.3392555279" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5799,7 +5799,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5837,6 +5836,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6549,8 +6549,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6761,12 +6761,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6817,6 +6811,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index dadebcdbe6..2eaa73a1b6 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.proteus_f7.1796110805" + signature = "rusEFI master.2024.12.23.proteus_f7.3392555279" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.proteus_f7.1796110805" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.proteus_f7.3392555279" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5799,7 +5799,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5837,6 +5836,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6549,8 +6549,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6761,12 +6761,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6817,6 +6811,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 9e539aff9c..a39fae6fff 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.proteus_h7.1796110805" + signature = "rusEFI master.2024.12.23.proteus_h7.3392555279" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.proteus_h7.1796110805" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.proteus_h7.3392555279" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5799,7 +5799,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5837,6 +5836,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6549,8 +6549,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6761,12 +6761,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6817,6 +6811,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 3a8dca85f9..bf0cf5a041 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.s105.3110447191" + signature = "rusEFI master.2024.12.23.s105.408787085" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.s105.3110447191" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.s105.408787085" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6533,8 +6533,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6734,12 +6734,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6790,6 +6784,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index d1c2041102..ae87a50cdc 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.small-can-board.1511327160" + signature = "rusEFI master.2024.12.23.small-can-board.4214044002" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.small-can-board.1511327160" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.small-can-board.4214044002" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6531,8 +6531,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 6da41f5884..4a841dc69c 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.stm32f429_nucleo.116271253" + signature = "rusEFI master.2024.12.23.stm32f429_nucleo.2815825999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.stm32f429_nucleo.116271253" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.stm32f429_nucleo.2815825999" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 84ff515bc2..940c808e85 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.stm32f767_nucleo.116271253" + signature = "rusEFI master.2024.12.23.stm32f767_nucleo.2815825999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.stm32f767_nucleo.116271253" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.stm32f767_nucleo.2815825999" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index 0a970da1bb..df6406babf 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.stm32h743_nucleo.116271253" + signature = "rusEFI master.2024.12.23.stm32h743_nucleo.2815825999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.stm32h743_nucleo.116271253" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.stm32h743_nucleo.2815825999" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index d242697155..a9120ccce5 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.subaru_eg33_f7.1506742475" + signature = "rusEFI master.2024.12.23.subaru_eg33_f7.4176945169" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.subaru_eg33_f7.1506742475" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.subaru_eg33_f7.4176945169" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6534,8 +6534,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6735,12 +6735,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6791,6 +6785,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 644f2ccce8..3a7b925e94 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.t-b-g.116271253" + signature = "rusEFI master.2024.12.23.t-b-g.2815825999" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.t-b-g.116271253" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.t-b-g.2815825999" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 231cb07ea9..399999cbf0 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.tdg-pdm8.1019450397" + signature = "rusEFI master.2024.12.23.tdg-pdm8.2650514631" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.tdg-pdm8.1019450397" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.tdg-pdm8.2650514631" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5798,7 +5798,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5836,6 +5835,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6532,8 +6532,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6733,12 +6733,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6789,6 +6783,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 56786d977e..d6dad1b70e 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.uaefi.112699014" + signature = "rusEFI master.2024.12.23.uaefi.2811205212" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.uaefi.112699014" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.uaefi.2811205212" ; 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 @@ -3183,45 +3183,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5809,7 +5809,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5847,6 +5846,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6562,8 +6562,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6765,12 +6765,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6821,6 +6815,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/firmware/tunerstudio/generated/rusefi_uaefi121.ini b/firmware/tunerstudio/generated/rusefi_uaefi121.ini index 0cf9613c4b..9c6536ed6d 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi121.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi121.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.12.23.uaefi121.4034551275" + signature = "rusEFI master.2024.12.23.uaefi121.1363307825" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.12.23.uaefi121.4034551275" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.12.23.uaefi121.1363307825" ; 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 @@ -3180,45 +3180,45 @@ luaTimingAdd = scalar, F32, 944, "deg", 1, 0 luaTimingMult = scalar, F32, 948, "deg", 1, 0 luaIgnitionSkip = bits, U32, 952, [0:0] ; total TS size = 956 -m_isPriming = bits, U32, 956, [0:0] -; total TS size = 960 -m_knockLevel = scalar, F32, 960, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 964, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 965, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 966, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 967, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 968, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 969, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 970, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 971, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 972, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 973, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 974, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 975, "dBv", 1, 0 -m_knockRetard = scalar, F32, 976, "deg", 1,0 -m_knockThreshold = scalar, F32, 980, "", 1, 0 -m_knockCount = scalar, U32, 984, "", 1, 0 -m_maximumRetard = scalar, F32, 988, "", 1, 0 -m_knockSpectrum1 = scalar, U32, 992, "compressed data", 1, 0 -m_knockSpectrum2 = scalar, U32, 996, "compressed data", 1, 0 -m_knockSpectrum3 = scalar, U32, 1000, "compressed data", 1, 0 -m_knockSpectrum4 = scalar, U32, 1004, "compressed data", 1, 0 -m_knockSpectrum5 = scalar, U32, 1008, "compressed data", 1, 0 -m_knockSpectrum6 = scalar, U32, 1012, "compressed data", 1, 0 -m_knockSpectrum7 = scalar, U32, 1016, "compressed data", 1, 0 -m_knockSpectrum8 = scalar, U32, 1020, "compressed data", 1, 0 -m_knockSpectrum9 = scalar, U32, 1024, "compressed data", 1, 0 -m_knockSpectrum10 = scalar, U32, 1028, "compressed data", 1, 0 -m_knockSpectrum11 = scalar, U32, 1032, "compressed data", 1, 0 -m_knockSpectrum12 = scalar, U32, 1036, "compressed data", 1, 0 -m_knockSpectrum13 = scalar, U32, 1040, "compressed data", 1, 0 -m_knockSpectrum14 = scalar, U32, 1044, "compressed data", 1, 0 -m_knockSpectrum15 = scalar, U32, 1048, "compressed data", 1, 0 -m_knockSpectrum16 = scalar, U32, 1052, "compressed data", 1, 0 -m_knockSpectrumChannelCyl = scalar, U16, 1056, "compressed N + N", 1, 0 -m_knockFrequencyStart = scalar, U16, 1058, "Hz", 1, 0 -m_knockFrequencyStep = scalar, F32, 1060, "Hz", 1, 0 -m_knockFuelTrimMultiplier = scalar, F32, 1064, "multiplier", 1, 0 +m_knockLevel = scalar, F32, 956, "Volts", 1, 0 +m_knockCyl1 = scalar, S08, 960, "dBv", 1, 0 +m_knockCyl2 = scalar, S08, 961, "dBv", 1, 0 +m_knockCyl3 = scalar, S08, 962, "dBv", 1, 0 +m_knockCyl4 = scalar, S08, 963, "dBv", 1, 0 +m_knockCyl5 = scalar, S08, 964, "dBv", 1, 0 +m_knockCyl6 = scalar, S08, 965, "dBv", 1, 0 +m_knockCyl7 = scalar, S08, 966, "dBv", 1, 0 +m_knockCyl8 = scalar, S08, 967, "dBv", 1, 0 +m_knockCyl9 = scalar, S08, 968, "dBv", 1, 0 +m_knockCyl10 = scalar, S08, 969, "dBv", 1, 0 +m_knockCyl11 = scalar, S08, 970, "dBv", 1, 0 +m_knockCyl12 = scalar, S08, 971, "dBv", 1, 0 +m_knockRetard = scalar, F32, 972, "deg", 1,0 +m_knockThreshold = scalar, F32, 976, "", 1, 0 +m_knockCount = scalar, U32, 980, "", 1, 0 +m_maximumRetard = scalar, F32, 984, "", 1, 0 +m_knockSpectrum1 = scalar, U32, 988, "compressed data", 1, 0 +m_knockSpectrum2 = scalar, U32, 992, "compressed data", 1, 0 +m_knockSpectrum3 = scalar, U32, 996, "compressed data", 1, 0 +m_knockSpectrum4 = scalar, U32, 1000, "compressed data", 1, 0 +m_knockSpectrum5 = scalar, U32, 1004, "compressed data", 1, 0 +m_knockSpectrum6 = scalar, U32, 1008, "compressed data", 1, 0 +m_knockSpectrum7 = scalar, U32, 1012, "compressed data", 1, 0 +m_knockSpectrum8 = scalar, U32, 1016, "compressed data", 1, 0 +m_knockSpectrum9 = scalar, U32, 1020, "compressed data", 1, 0 +m_knockSpectrum10 = scalar, U32, 1024, "compressed data", 1, 0 +m_knockSpectrum11 = scalar, U32, 1028, "compressed data", 1, 0 +m_knockSpectrum12 = scalar, U32, 1032, "compressed data", 1, 0 +m_knockSpectrum13 = scalar, U32, 1036, "compressed data", 1, 0 +m_knockSpectrum14 = scalar, U32, 1040, "compressed data", 1, 0 +m_knockSpectrum15 = scalar, U32, 1044, "compressed data", 1, 0 +m_knockSpectrum16 = scalar, U32, 1048, "compressed data", 1, 0 +m_knockSpectrumChannelCyl = scalar, U16, 1052, "compressed N + N", 1, 0 +m_knockFrequencyStart = scalar, U16, 1054, "Hz", 1, 0 +m_knockFrequencyStep = scalar, F32, 1056, "Hz", 1, 0 +m_knockFuelTrimMultiplier = scalar, F32, 1060, "multiplier", 1, 0 +; total TS size = 1064 +m_isPriming = bits, U32, 1064, [0:0] ; total TS size = 1068 tcuCurrentGear = scalar, S08, 1068, "gear", 1, 0 tcRatio = scalar, U16, 1070, "value", 0.01, 0 @@ -5799,7 +5799,6 @@ entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" entry = luaIgnitionSkip, "Ign: Lua Spark Skip", int, "%d" -entry = m_isPriming, "IsFuelPriming", int, "%d" entry = m_knockLevel, "Knock: Current level", float, "%.3f" entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" @@ -5837,6 +5836,7 @@ entry = m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", int, "%d" entry = m_knockFrequencyStart, "Knock: Start Freq", int, "%d" entry = m_knockFrequencyStep, "Knock: Step Freq", float, "%.3f" entry = m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", float, "%.3f" +entry = m_isPriming, "IsFuelPriming", int, "%d" entry = tcuCurrentGear, "TCU: Current Gear", int, "%d" entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" entry = lastShiftTime, "lastShiftTime", float, "%.3f" @@ -6551,8 +6551,8 @@ menuDialog = main menu = "&View", { 1 }, { uiMode == 0 || uiMode == 1 } subMenu = fuel_computerDialog, "fuel_computer" subMenu = ignition_stateDialog, "ignition_state" - subMenu = prime_injectionDialog, "prime_injection" subMenu = knock_controllerDialog, "knock_controller" + subMenu = prime_injectionDialog, "prime_injection" subMenu = tcu_controllerDialog, "tcu_controller" subMenu = throttle_modelDialog, "throttle_model" subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" @@ -6754,12 +6754,6 @@ dialog = ignition_stateDialog, "ignition_state" liveGraph = ignition_state_4_Graph, "Graph", South graphLine = luaTimingMult -indicatorPanel = prime_injectionIndicatorPanel, 2 - indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" - -dialog = prime_injectionDialog, "prime_injection" - panel = prime_injectionIndicatorPanel - dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_1_Graph, "Graph", South @@ -6810,6 +6804,12 @@ dialog = knock_controllerDialog, "knock_controller" liveGraph = knock_controller_10_Graph, "Graph", South graphLine = m_knockFuelTrimMultiplier +indicatorPanel = prime_injectionIndicatorPanel, 2 + indicator = {m_isPriming}, "m_isPriming No", "m_isPriming Yes" + +dialog = prime_injectionDialog, "prime_injection" + panel = prime_injectionIndicatorPanel + indicatorPanel = tcu_controllerIndicatorPanel, 2 indicator = {isShifting}, "isShifting No", "isShifting Yes" diff --git a/java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java b/java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java index 6b60137eac..c2a145ad38 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java +++ b/java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java @@ -1,5 +1,5 @@ package com.rusefi.enums; -//was generated automatically by rusEFI tool config_definition_base-all.jar based on StateDictionaryGenerator integration/LiveData.yaml on Sun Dec 22 14:00:53 UTC 2024n +//was generated automatically by rusEFI tool config_definition_base-all.jar based on StateDictionaryGenerator integration/LiveData.yaml on Mon Dec 23 14:44:01 UTC 2024n import com.rusefi.config.generated.*; import com.rusefi.ldmp.StateDictionary; @@ -8,8 +8,8 @@ public class StateDictionaryFactory { stateDictionary.register(live_data_e.LDS_output_channels, TsOutputs.VALUES, "status_loop"); stateDictionary.register(live_data_e.LDS_fuel_computer, FuelComputer.VALUES, "fuel_computer"); stateDictionary.register(live_data_e.LDS_ignition_state, IgnitionState.VALUES, "advance_map"); - stateDictionary.register(live_data_e.LDS_prime_injection, PrimeController.VALUES, "prime_injection"); stateDictionary.register(live_data_e.LDS_knock_controller, KnockController.VALUES, "knock_controller"); + stateDictionary.register(live_data_e.LDS_prime_injection, PrimeController.VALUES, "prime_injection"); stateDictionary.register(live_data_e.LDS_tcu_controller, TcuController.VALUES, "tcu_controller"); stateDictionary.register(live_data_e.LDS_throttle_model, ThrottleModel.VALUES, "throttle_model"); stateDictionary.register(live_data_e.LDS_high_pressure_fuel_pump, HighPressureFuelPump.VALUES, "high_pressure_fuel_pump"); diff --git a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java index 57d74c5309..2d23cb67fb 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java @@ -8,8 +8,8 @@ public enum live_data_e { LDS_output_channels, LDS_fuel_computer, LDS_ignition_state, - LDS_prime_injection, LDS_knock_controller, + LDS_prime_injection, LDS_tcu_controller, LDS_throttle_model, LDS_high_pressure_fuel_pump, 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 da1af437d4..f57abb2f2d 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 @@ -1242,6 +1242,7 @@ public class Fields { public static final int SentInput_INPUT6 = 6; public static final int SentInput_INPUT7 = 7; public static final int SentInput_NONE = 0; + public static final int SIGNATURE_HASH = 1198445042; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1507,7 +1508,7 @@ 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 master.2024.12.23.f407-discovery.3864453416"; + public static final String TS_SIGNATURE = "rusEFI master.2024.12.23.f407-discovery.1198445042"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java b/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java index 218df6c262..eb87f62078 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java @@ -180,43 +180,43 @@ public class KnockController { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field M_KNOCKLEVEL = Field.create("M_KNOCKLEVEL", 0, FieldType.FLOAT).setBaseOffset(960); - public static final Field M_KNOCKCYL1 = Field.create("M_KNOCKCYL1", 4, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL2 = Field.create("M_KNOCKCYL2", 5, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL3 = Field.create("M_KNOCKCYL3", 6, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL4 = Field.create("M_KNOCKCYL4", 7, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL5 = Field.create("M_KNOCKCYL5", 8, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL6 = Field.create("M_KNOCKCYL6", 9, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL7 = Field.create("M_KNOCKCYL7", 10, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL8 = Field.create("M_KNOCKCYL8", 11, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL9 = Field.create("M_KNOCKCYL9", 12, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL10 = Field.create("M_KNOCKCYL10", 13, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL11 = Field.create("M_KNOCKCYL11", 14, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKCYL12 = Field.create("M_KNOCKCYL12", 15, FieldType.INT8).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKRETARD = Field.create("M_KNOCKRETARD", 16, FieldType.FLOAT).setBaseOffset(960); - public static final Field M_KNOCKTHRESHOLD = Field.create("M_KNOCKTHRESHOLD", 20, FieldType.FLOAT).setBaseOffset(960); - public static final Field M_KNOCKCOUNT = Field.create("M_KNOCKCOUNT", 24, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_MAXIMUMRETARD = Field.create("M_MAXIMUMRETARD", 28, FieldType.FLOAT).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM1 = Field.create("M_KNOCKSPECTRUM1", 32, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM2 = Field.create("M_KNOCKSPECTRUM2", 36, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM3 = Field.create("M_KNOCKSPECTRUM3", 40, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM4 = Field.create("M_KNOCKSPECTRUM4", 44, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM5 = Field.create("M_KNOCKSPECTRUM5", 48, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM6 = Field.create("M_KNOCKSPECTRUM6", 52, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM7 = Field.create("M_KNOCKSPECTRUM7", 56, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM8 = Field.create("M_KNOCKSPECTRUM8", 60, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM9 = Field.create("M_KNOCKSPECTRUM9", 64, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM10 = Field.create("M_KNOCKSPECTRUM10", 68, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM11 = Field.create("M_KNOCKSPECTRUM11", 72, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM12 = Field.create("M_KNOCKSPECTRUM12", 76, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM13 = Field.create("M_KNOCKSPECTRUM13", 80, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM14 = Field.create("M_KNOCKSPECTRUM14", 84, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM15 = Field.create("M_KNOCKSPECTRUM15", 88, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUM16 = Field.create("M_KNOCKSPECTRUM16", 92, FieldType.INT).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKSPECTRUMCHANNELCYL = Field.create("M_KNOCKSPECTRUMCHANNELCYL", 96, FieldType.INT16).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKFREQUENCYSTART = Field.create("M_KNOCKFREQUENCYSTART", 98, FieldType.INT16).setScale(1.0).setBaseOffset(960); - public static final Field M_KNOCKFREQUENCYSTEP = Field.create("M_KNOCKFREQUENCYSTEP", 100, FieldType.FLOAT).setBaseOffset(960); - public static final Field M_KNOCKFUELTRIMMULTIPLIER = Field.create("M_KNOCKFUELTRIMMULTIPLIER", 104, FieldType.FLOAT).setBaseOffset(960); + public static final Field M_KNOCKLEVEL = Field.create("M_KNOCKLEVEL", 0, FieldType.FLOAT).setBaseOffset(956); + public static final Field M_KNOCKCYL1 = Field.create("M_KNOCKCYL1", 4, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL2 = Field.create("M_KNOCKCYL2", 5, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL3 = Field.create("M_KNOCKCYL3", 6, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL4 = Field.create("M_KNOCKCYL4", 7, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL5 = Field.create("M_KNOCKCYL5", 8, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL6 = Field.create("M_KNOCKCYL6", 9, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL7 = Field.create("M_KNOCKCYL7", 10, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL8 = Field.create("M_KNOCKCYL8", 11, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL9 = Field.create("M_KNOCKCYL9", 12, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL10 = Field.create("M_KNOCKCYL10", 13, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL11 = Field.create("M_KNOCKCYL11", 14, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKCYL12 = Field.create("M_KNOCKCYL12", 15, FieldType.INT8).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKRETARD = Field.create("M_KNOCKRETARD", 16, FieldType.FLOAT).setBaseOffset(956); + public static final Field M_KNOCKTHRESHOLD = Field.create("M_KNOCKTHRESHOLD", 20, FieldType.FLOAT).setBaseOffset(956); + public static final Field M_KNOCKCOUNT = Field.create("M_KNOCKCOUNT", 24, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_MAXIMUMRETARD = Field.create("M_MAXIMUMRETARD", 28, FieldType.FLOAT).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM1 = Field.create("M_KNOCKSPECTRUM1", 32, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM2 = Field.create("M_KNOCKSPECTRUM2", 36, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM3 = Field.create("M_KNOCKSPECTRUM3", 40, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM4 = Field.create("M_KNOCKSPECTRUM4", 44, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM5 = Field.create("M_KNOCKSPECTRUM5", 48, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM6 = Field.create("M_KNOCKSPECTRUM6", 52, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM7 = Field.create("M_KNOCKSPECTRUM7", 56, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM8 = Field.create("M_KNOCKSPECTRUM8", 60, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM9 = Field.create("M_KNOCKSPECTRUM9", 64, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM10 = Field.create("M_KNOCKSPECTRUM10", 68, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM11 = Field.create("M_KNOCKSPECTRUM11", 72, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM12 = Field.create("M_KNOCKSPECTRUM12", 76, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM13 = Field.create("M_KNOCKSPECTRUM13", 80, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM14 = Field.create("M_KNOCKSPECTRUM14", 84, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM15 = Field.create("M_KNOCKSPECTRUM15", 88, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUM16 = Field.create("M_KNOCKSPECTRUM16", 92, FieldType.INT).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKSPECTRUMCHANNELCYL = Field.create("M_KNOCKSPECTRUMCHANNELCYL", 96, FieldType.INT16).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKFREQUENCYSTART = Field.create("M_KNOCKFREQUENCYSTART", 98, FieldType.INT16).setScale(1.0).setBaseOffset(956); + public static final Field M_KNOCKFREQUENCYSTEP = Field.create("M_KNOCKFREQUENCYSTEP", 100, FieldType.FLOAT).setBaseOffset(956); + public static final Field M_KNOCKFUELTRIMMULTIPLIER = Field.create("M_KNOCKFUELTRIMMULTIPLIER", 104, FieldType.FLOAT).setBaseOffset(956); public static final Field[] VALUES = { M_KNOCKLEVEL, M_KNOCKCYL1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/PrimeController.java b/java_console/models/src/main/java/com/rusefi/config/generated/PrimeController.java index d8550af69e..e7357d6e1d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/PrimeController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/PrimeController.java @@ -180,7 +180,7 @@ public class PrimeController { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field M_ISPRIMING = Field.create("M_ISPRIMING", 0, FieldType.BIT, 0).setBaseOffset(956); + public static final Field M_ISPRIMING = Field.create("M_ISPRIMING", 0, FieldType.BIT, 0).setBaseOffset(1064); public static final Field[] VALUES = { M_ISPRIMING, };