diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index c285b27dc5..69d1361955 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -396,6 +396,7 @@ #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 #define GAP_TRACKING_LENGTH 18 +#define GAUGE_CATEGORY_BOOST_CONTROL "Boost Control" #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_TIMING "Timing" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" @@ -1044,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_13389 +#define SIGNATURE_HASH snap_13528 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1319,7 +1320,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2023.01.16.cypress.snap_13389" +#define TS_SIGNATURE "rusEFI 2023.01.16.cypress.snap_13528" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 7aa5430492..20b974faaf 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -396,6 +396,7 @@ #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 #define GAP_TRACKING_LENGTH 18 +#define GAUGE_CATEGORY_BOOST_CONTROL "Boost Control" #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_TIMING "Timing" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" @@ -1044,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_38529 +#define SIGNATURE_HASH snap_38420 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1319,7 +1320,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2023.01.16.kin.snap_38529" +#define TS_SIGNATURE "rusEFI 2023.01.16.kin.snap_38420" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index edc1565105..f1ef20695b 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -390,6 +390,7 @@ #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 #define GAP_TRACKING_LENGTH 18 +#define GAUGE_CATEGORY_BOOST_CONTROL "Boost Control" #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_TIMING "Timing" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" @@ -994,7 +995,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH snap_60823 +#define SIGNATURE_HASH snap_60674 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1270,7 +1271,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2023.01.16.subaru_eg33_f7.snap_60823" +#define TS_SIGNATURE "rusEFI 2023.01.16.subaru_eg33_f7.snap_60674" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 6ee94b5314..675d935b96 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -363,7 +363,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 2b642779a6..72268c018d 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -112,10 +112,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index d968f34802..faec8cbdc0 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -12,3 +12,8 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 744887d0c9..6b4272579c 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -535,12 +535,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index ef0e5d3d6a..230a3852ce 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -403,13 +403,14 @@ retardThresholdRpm("retardThresholdRpm", SensorCategory.SENSOR_INPUTS, FieldType fuelALSCorrection("fuelALSCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 892, 1.0, -1.0, -1.0, ""), timingALSCorrection("timingALSCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 896, 0.01, -20.0, 20.0, "deg"), alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 898, 1.0, -20.0, 100.0, "units"), -luaTargetAdd("luaTargetAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -1.0, -1.0, ""), +luaTargetAdd("Boost: Lua Target Add", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 904, 0.5, -100.0, 100.0, "v"), +boostOutput("Boost: Output", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 906, 0.5, -100.0, 100.0, "v"), luaTargetMult("luaTargetMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -1.0, -1.0, ""), openLoopPart("openLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -1.0, -1.0, ""), luaOpenLoopAdd("luaOpenLoopAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -1.0, -1.0, ""), boostControllerClosedLoopPart("Boost Closed Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 920, 0.5, -50.0, 50.0, "%"), alignmentFill_at_21("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 921, 1.0, -20.0, 100.0, "units"), -boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 922, 0.03333333333333333, 0.0, 0.0, "kPa"), +boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 922, 0.03333333333333333, 0.0, 300.0, "kPa"), latest_usage_ac_control("AC latest activity", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -1.0, -1.0, ""), lua("lua", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index b40ebfaa9e..dc1e605741 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -270,6 +270,13 @@ static constexpr LogField fields[] = { {engine->ignitionState.dwellVoltageCorrection, "dwellVoltageCorrection", "", 0}, {engine->ignitionState.luaTimingAdd, "luaTimingAdd", "deg", 2}, {engine->ignitionState.luaTimingMult, "luaTimingMult", "deg", 2}, + {engine->boostController.luaTargetAdd, "Boost: Lua Target Add", "v", 1}, + {engine->boostController.boostOutput, "Boost: Output", "v", 1}, + {engine->boostController.luaTargetMult, "luaTargetMult", "", 0}, + {engine->boostController.openLoopPart, "openLoopPart", "", 0}, + {engine->boostController.luaOpenLoopAdd, "luaOpenLoopAdd", "", 0}, + {engine->boostController.boostControllerClosedLoopPart, "Boost Closed Loop", "%", 1}, + {engine->boostController.boostControlTarget, "Boost Target", "kPa", 1}, {engine->engineState.lua.fuelAdd, "lua.fuelAdd", "", 0}, {engine->engineState.lua.fuelMult, "lua.fuelMult", "", 0}, {engine->engineState.sd.tCharge, "speed density", "", 0}, diff --git a/firmware/controllers/actuators/boost_control_generated.h b/firmware/controllers/actuators/boost_control_generated.h index 52141b9e97..9a3048ca1c 100644 --- a/firmware/controllers/actuators/boost_control_generated.h +++ b/firmware/controllers/actuators/boost_control_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Jan 16 20:36:57 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Jan 16 21:30:42 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -102,9 +102,17 @@ struct boost_control_s { offset 0 bit 31 */ bool unusedBit_6_31 : 1 {}; /** + * "Boost: Lua Target Add" + v * offset 4 */ - float luaTargetAdd = (float)0; + scaled_channel luaTargetAdd = (int16_t)0; + /** + * "Boost: Output" + v + * offset 6 + */ + scaled_channel boostOutput = (int16_t)0; /** * offset 8 */ @@ -139,4 +147,4 @@ struct boost_control_s { static_assert(sizeof(boost_control_s) == 24); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Jan 16 20:36:57 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Jan 16 21:30:42 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 3ccc9a407e..2addafe5b3 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -396,6 +396,7 @@ #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 #define GAP_TRACKING_LENGTH 18 +#define GAUGE_CATEGORY_BOOST_CONTROL "Boost Control" #define GAUGE_CATEGORY_FUEL_MATH "Fuel: math" #define GAUGE_CATEGORY_TIMING "Timing" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" @@ -1044,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_13389 +#define SIGNATURE_HASH snap_13528 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1319,7 +1320,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2023.01.16.all.snap_13389" +#define TS_SIGNATURE "rusEFI 2023.01.16.all.snap_13528" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index a352104669..ef372b5234 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_15362 -#define TS_SIGNATURE "rusEFI 2023.01.16.48way.snap_15362" +#define SIGNATURE_HASH snap_15511 +#define TS_SIGNATURE "rusEFI 2023.01.16.48way.snap_15511" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 20b954f662..f46a2c2bdf 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_13389 -#define TS_SIGNATURE "rusEFI 2023.01.16.all.snap_13389" +#define SIGNATURE_HASH snap_13528 +#define TS_SIGNATURE "rusEFI 2023.01.16.all.snap_13528" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 37e7b0fa0f..d63b3a470c 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_43297 -#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-2chan.snap_43297" +#define SIGNATURE_HASH snap_43444 +#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-2chan.snap_43444" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 916fdb2a4d..ef1880c2de 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_9572 -#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-4chan.snap_9572" +#define SIGNATURE_HASH snap_9713 +#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-4chan.snap_9713" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 95229fb4c1..26187b375e 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_43969 -#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-8chan.snap_43969" +#define SIGNATURE_HASH snap_43860 +#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-8chan.snap_43860" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 01f1d6e22d..5af8a4c2c0 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_49514 -#define TS_SIGNATURE "rusEFI 2023.01.16.atlas.snap_49514" +#define SIGNATURE_HASH snap_49663 +#define TS_SIGNATURE "rusEFI 2023.01.16.atlas.snap_49663" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 5a68c7e8cd..0ce0d45009 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_26036 -#define TS_SIGNATURE "rusEFI 2023.01.16.core8.snap_26036" +#define SIGNATURE_HASH snap_25889 +#define TS_SIGNATURE "rusEFI 2023.01.16.core8.snap_25889" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index ddd4e85248..8085e114a9 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_13389 -#define TS_SIGNATURE "rusEFI 2023.01.16.cypress.snap_13389" +#define SIGNATURE_HASH snap_13528 +#define TS_SIGNATURE "rusEFI 2023.01.16.cypress.snap_13528" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 4aced3812d..f75e14649e 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_13389 -#define TS_SIGNATURE "rusEFI 2023.01.16.f407-discovery.snap_13389" +#define SIGNATURE_HASH snap_13528 +#define TS_SIGNATURE "rusEFI 2023.01.16.f407-discovery.snap_13528" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index de36f5c265..ad9b2f8f82 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_13389 -#define TS_SIGNATURE "rusEFI 2023.01.16.f429-discovery.snap_13389" +#define SIGNATURE_HASH snap_13528 +#define TS_SIGNATURE "rusEFI 2023.01.16.f429-discovery.snap_13528" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 74630e0f81..6669fd596a 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_51337 -#define TS_SIGNATURE "rusEFI 2023.01.16.frankenso_na6.snap_51337" +#define SIGNATURE_HASH snap_51228 +#define TS_SIGNATURE "rusEFI 2023.01.16.frankenso_na6.snap_51228" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 4c7be6983b..f1f17e1052 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_29362 -#define TS_SIGNATURE "rusEFI 2023.01.16.harley81.snap_29362" +#define SIGNATURE_HASH snap_29223 +#define TS_SIGNATURE "rusEFI 2023.01.16.harley81.snap_29223" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 233601e80d..8217973c44 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_22345 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen-gm-e67.snap_22345" +#define SIGNATURE_HASH snap_22492 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen-gm-e67.snap_22492" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 852dcd2ebc..f603e0ca20 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_1409 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen-nb1.snap_1409" +#define SIGNATURE_HASH snap_1300 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen-nb1.snap_1300" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index ea7edcd58e..a1ab74adba 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_51679 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen121nissan.snap_51679" +#define SIGNATURE_HASH snap_51530 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen121nissan.snap_51530" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index c73eb40388..1a85e684b5 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_41808 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen121vag.snap_41808" +#define SIGNATURE_HASH snap_41925 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen121vag.snap_41925" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 3d6925204d..09fab087c7 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_18806 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen128.snap_18806" +#define SIGNATURE_HASH snap_18915 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen128.snap_18915" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 1276c47536..b483e22996 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_3758 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen154hyundai.snap_3758" +#define SIGNATURE_HASH snap_3643 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen154hyundai.snap_3643" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 4ecf22e31d..7cb0d5d179 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_15046 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen72.snap_15046" +#define SIGNATURE_HASH snap_14931 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen72.snap_14931" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a58fddc991..f77ecaaf10 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_43568 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen81.snap_43568" +#define SIGNATURE_HASH snap_43685 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen81.snap_43685" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index b8c9d617db..de62549aaa 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_10113 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen88bmw.snap_10113" +#define SIGNATURE_HASH snap_10004 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellen88bmw.snap_10004" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 538a44b2ba..e7bd1f2554 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_34170 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellenNA6.snap_34170" +#define SIGNATURE_HASH snap_34287 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellenNA6.snap_34287" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index b904604683..6772813857 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_34213 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellenNA8_96.snap_34213" +#define SIGNATURE_HASH snap_34096 +#define TS_SIGNATURE "rusEFI 2023.01.16.hellenNA8_96.snap_34096" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index a02b65a257..71c4b5bc30 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_38529 -#define TS_SIGNATURE "rusEFI 2023.01.16.kin.snap_38529" +#define SIGNATURE_HASH snap_38420 +#define TS_SIGNATURE "rusEFI 2023.01.16.kin.snap_38420" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 949a93c600..689b37df36 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 ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_59766 -#define TS_SIGNATURE "rusEFI 2023.01.16.m74_9.snap_59766" +#define SIGNATURE_HASH snap_59875 +#define TS_SIGNATURE "rusEFI 2023.01.16.m74_9.snap_59875" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 1a41c0eefc..4d4a49e599 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_21325 -#define TS_SIGNATURE "rusEFI 2023.01.16.mre_f4.snap_21325" +#define SIGNATURE_HASH snap_21464 +#define TS_SIGNATURE "rusEFI 2023.01.16.mre_f4.snap_21464" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index ca9b691239..c6363a9afc 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_21325 -#define TS_SIGNATURE "rusEFI 2023.01.16.mre_f7.snap_21325" +#define SIGNATURE_HASH snap_21464 +#define TS_SIGNATURE "rusEFI 2023.01.16.mre_f7.snap_21464" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 4c2d94a4df..08212f770f 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_60843 -#define TS_SIGNATURE "rusEFI 2023.01.16.prometheus_405.snap_60843" +#define SIGNATURE_HASH snap_60734 +#define TS_SIGNATURE "rusEFI 2023.01.16.prometheus_405.snap_60734" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 6eebc09ca5..225196936f 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_60843 -#define TS_SIGNATURE "rusEFI 2023.01.16.prometheus_469.snap_60843" +#define SIGNATURE_HASH snap_60734 +#define TS_SIGNATURE "rusEFI 2023.01.16.prometheus_469.snap_60734" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8fd60a4136..779ff73409 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_65533 -#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_f4.snap_65533" +#define SIGNATURE_HASH snap_65384 +#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_f4.snap_65384" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 8d32f79320..88e6b8041e 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_65533 -#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_f7.snap_65533" +#define SIGNATURE_HASH snap_65384 +#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_f7.snap_65384" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 7eb335ff20..026856ee3e 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_65533 -#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_h7.snap_65533" +#define SIGNATURE_HASH snap_65384 +#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_h7.snap_65384" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 14e820b843..4748999d28 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 ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_38794 -#define TS_SIGNATURE "rusEFI 2023.01.16.s105.snap_38794" +#define SIGNATURE_HASH snap_38687 +#define TS_SIGNATURE "rusEFI 2023.01.16.s105.snap_38687" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index c2d877ad48..71c940f2c0 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_60823 -#define TS_SIGNATURE "rusEFI 2023.01.16.subaru_eg33_f7.snap_60823" +#define SIGNATURE_HASH snap_60674 +#define TS_SIGNATURE "rusEFI 2023.01.16.subaru_eg33_f7.snap_60674" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 006bac0675..c0e5f33381 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_64025 -#define TS_SIGNATURE "rusEFI 2023.01.16.tdg-pdm8.snap_64025" +#define SIGNATURE_HASH snap_64140 +#define TS_SIGNATURE "rusEFI 2023.01.16.tdg-pdm8.snap_64140" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index cc90158ad0..ac7225aa97 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -519,6 +519,32 @@ float getOutputValueByName(const char *name) { return engine->ignitionState.luaTimingAdd; case -1626770351: return engine->ignitionState.luaTimingMult; + case -575666209: + return engine->boostController.isTpsInvalid; + case 1846215200: + return engine->boostController.m_shouldResetPid; + case 1826317915: + return engine->boostController.isBelowClosedLoopThreshold; + case -1642402810: + return engine->boostController.isNotClosedLoop; + case 2111912944: + return engine->boostController.isZeroRpm; + case -2011570052: + return engine->boostController.hasInitBoost; + case 119157463: + return engine->boostController.luaTargetAdd; + case 1239062717: + return engine->boostController.boostOutput; + case -362320880: + return engine->boostController.luaTargetMult; + case -1481117304: + return engine->boostController.openLoopPart; + case 1944984220: + return engine->boostController.luaOpenLoopAdd; + case -707712709: + return engine->boostController.boostControllerClosedLoopPart; + case -1712045196: + return engine->boostController.boostControlTarget; case 1649801578: return engine->engineState.lua.fuelAdd; case -1390672637: diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index f9a127e1ad..83db56f8f4 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.all.snap_13389" + signature = "rusEFI 2023.01.16.all.snap_13528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.all.snap_13389" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.all.snap_13528" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:42 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:34 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5459,10 +5466,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 407a3e703f..c290828977 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.48way.snap_15362" + signature = "rusEFI 2023.01.16.48way.snap_15511" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.48way.snap_15362" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.48way.snap_15511" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:25 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:15 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5457,10 +5464,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 1c4ea2a66b..2681e80910 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.alphax-2chan.snap_43297" + signature = "rusEFI 2023.01.16.alphax-2chan.snap_43444" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.alphax-2chan.snap_43297" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.alphax-2chan.snap_43444" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:01 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:47 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5453,10 +5460,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 6d140a2dd8..d7faaf256b 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.alphax-4chan.snap_9572" + signature = "rusEFI 2023.01.16.alphax-4chan.snap_9713" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.alphax-4chan.snap_9572" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.alphax-4chan.snap_9713" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:03 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:49 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 962bb15fc9..ca5a59c7d0 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.alphax-8chan.snap_43969" + signature = "rusEFI 2023.01.16.alphax-8chan.snap_43860" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.alphax-8chan.snap_43969" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.alphax-8chan.snap_43860" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:04 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:50 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 60153343d1..0d5af88972 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.atlas.snap_49514" + signature = "rusEFI 2023.01.16.atlas.snap_49663" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.atlas.snap_49514" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.atlas.snap_49663" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:39 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:32 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5459,10 +5466,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index afdadd691d..e3879ac688 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.core8.snap_26036" + signature = "rusEFI 2023.01.16.core8.snap_25889" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.core8.snap_26036" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.core8.snap_25889" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:24 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:13 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5457,10 +5464,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 58e1883c1c..7ac9e874a4 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.cypress.snap_13389" + signature = "rusEFI 2023.01.16.cypress.snap_13528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.cypress.snap_13389" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.cypress.snap_13528" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jan 16 20:36:59 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jan 16 21:30:45 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5459,10 +5466,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 6b2f82d56e..2c331d55c7 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.f407-discovery.snap_13389" + signature = "rusEFI 2023.01.16.f407-discovery.snap_13528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.f407-discovery.snap_13389" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.f407-discovery.snap_13528" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:37 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:29 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5459,10 +5466,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index c45b94943c..3c32466689 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.f429-discovery.snap_13389" + signature = "rusEFI 2023.01.16.f429-discovery.snap_13528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.f429-discovery.snap_13389" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.f429-discovery.snap_13528" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:38 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:30 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5459,10 +5466,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 4a54304e97..c70fe18673 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.frankenso_na6.snap_51337" + signature = "rusEFI 2023.01.16.frankenso_na6.snap_51228" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.frankenso_na6.snap_51337" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.frankenso_na6.snap_51228" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:29 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:19 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5459,10 +5466,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index aadb261dd1..9314d43896 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.harley81.snap_29362" + signature = "rusEFI 2023.01.16.harley81.snap_29223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.harley81.snap_29362" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.harley81.snap_29223" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:05 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:52 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 13fda05041..7be01b970b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen-gm-e67.snap_22345" + signature = "rusEFI 2023.01.16.hellen-gm-e67.snap_22492" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen-gm-e67.snap_22345" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen-gm-e67.snap_22492" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:17 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:06 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 367423a3bf..33ca545801 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen-nb1.snap_1409" + signature = "rusEFI 2023.01.16.hellen-nb1.snap_1300" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen-nb1.snap_1409" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen-nb1.snap_1300" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:16 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:04 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 753e7aa986..a0daf32bfb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen121nissan.snap_51679" + signature = "rusEFI 2023.01.16.hellen121nissan.snap_51530" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen121nissan.snap_51679" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen121nissan.snap_51530" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:09 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:56 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 9168d62131..6a45a77696 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen121vag.snap_41808" + signature = "rusEFI 2023.01.16.hellen121vag.snap_41925" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen121vag.snap_41808" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen121vag.snap_41925" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:08 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:55 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index c036cb3aa2..f3e47bbeb5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen128.snap_18806" + signature = "rusEFI 2023.01.16.hellen128.snap_18915" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen128.snap_18806" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen128.snap_18915" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:07 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:53 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index be6f486d46..9b2c1d1cbd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen154hyundai.snap_3758" + signature = "rusEFI 2023.01.16.hellen154hyundai.snap_3643" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen154hyundai.snap_3758" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen154hyundai.snap_3643" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:11 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:58 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 5763e82c63..43b73a38be 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen72.snap_15046" + signature = "rusEFI 2023.01.16.hellen72.snap_14931" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen72.snap_15046" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen72.snap_14931" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:13 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:01 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index ec9ba96ddd..e26dbd2db5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen81.snap_43568" + signature = "rusEFI 2023.01.16.hellen81.snap_43685" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen81.snap_43568" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen81.snap_43685" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:15 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:03 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5454,10 +5461,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 2fda16f169..2086e46c2d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellen88bmw.snap_10113" + signature = "rusEFI 2023.01.16.hellen88bmw.snap_10004" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen88bmw.snap_10113" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellen88bmw.snap_10004" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:12 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:59 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index a7f54b86e9..6399690936 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellenNA6.snap_34170" + signature = "rusEFI 2023.01.16.hellenNA6.snap_34287" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellenNA6.snap_34170" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellenNA6.snap_34287" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:19 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:07 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index e007575666..9f4b0f2fb2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.hellenNA8_96.snap_34213" + signature = "rusEFI 2023.01.16.hellenNA8_96.snap_34096" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellenNA8_96.snap_34213" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.hellenNA8_96.snap_34096" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:20 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:09 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 6180626f81..e1b3272ac2 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.kin.snap_38529" + signature = "rusEFI 2023.01.16.kin.snap_38420" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.kin.snap_38529" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.kin.snap_38420" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jan 16 20:36:58 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jan 16 21:30:43 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5459,10 +5466,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 6e7896d51f..1cd6e1f2a7 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.m74_9.snap_59766" + signature = "rusEFI 2023.01.16.m74_9.snap_59875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.m74_9.snap_59766" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.m74_9.snap_59875" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:27 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:16 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 6ec2d7bc7c..4ba0ecb70b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.mre_f4.snap_21325" + signature = "rusEFI 2023.01.16.mre_f4.snap_21464" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.mre_f4.snap_21325" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.mre_f4.snap_21464" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:12 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5457,10 +5464,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index c07c30cab9..6eb2215343 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.mre_f7.snap_21325" + signature = "rusEFI 2023.01.16.mre_f7.snap_21464" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.mre_f7.snap_21325" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.mre_f7.snap_21464" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:21 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:10 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5457,10 +5464,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 57b23cfc46..a9a2664651 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.prometheus_405.snap_60843" + signature = "rusEFI 2023.01.16.prometheus_405.snap_60734" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.prometheus_405.snap_60843" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.prometheus_405.snap_60734" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:32 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:23 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5453,10 +5460,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index e2067ed88f..175ca78616 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.prometheus_469.snap_60843" + signature = "rusEFI 2023.01.16.prometheus_469.snap_60734" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.prometheus_469.snap_60843" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.prometheus_469.snap_60734" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:30 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:21 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5453,10 +5460,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index e5b77b2e09..d45ccdcf61 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.proteus_f4.snap_65533" + signature = "rusEFI 2023.01.16.proteus_f4.snap_65384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.proteus_f4.snap_65533" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.proteus_f4.snap_65384" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:34 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:26 UTC 2023 pageSize = 26368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5453,10 +5460,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 2d7234053e..def3553c9b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.proteus_f7.snap_65533" + signature = "rusEFI 2023.01.16.proteus_f7.snap_65384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.proteus_f7.snap_65533" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.proteus_f7.snap_65384" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:33 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:24 UTC 2023 pageSize = 26368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5453,10 +5460,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 1df43eb6ad..c144f4e73e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.proteus_h7.snap_65533" + signature = "rusEFI 2023.01.16.proteus_h7.snap_65384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.proteus_h7.snap_65533" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.proteus_h7.snap_65384" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:35 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:27 UTC 2023 pageSize = 26368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5453,10 +5460,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 389f541d58..63330f4d55 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.s105.snap_38794" + signature = "rusEFI 2023.01.16.s105.snap_38687" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.s105.snap_38794" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.s105.snap_38687" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:28 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:18 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5456,10 +5463,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 4c22f55add..49d320dc2c 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.subaru_eg33_f7.snap_60823" + signature = "rusEFI 2023.01.16.subaru_eg33_f7.snap_60674" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.subaru_eg33_f7.snap_60823" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.subaru_eg33_f7.snap_60674" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:00 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Jan 16 21:30:46 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5455,10 +5462,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 1bb9473744..3a74b1bfce 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2023.01.16.tdg-pdm8.snap_64025" + signature = "rusEFI 2023.01.16.tdg-pdm8.snap_64140" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.tdg-pdm8.snap_64025" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.16.tdg-pdm8.snap_64140" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 20:37:40 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:33 UTC 2023 pageSize = 22368 page = 1 @@ -2750,12 +2750,13 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] -luaTargetAdd = scalar, F32, 904, "", 1, 0 +luaTargetAdd = scalar, S16, 904, "v", 0.5,0 +boostOutput = scalar, S16, 906, "v", 0.5,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5, 0 -boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333, 0 +boostControllerClosedLoopPart = scalar, S08, 920, "%", 0.5,0 +boostControlTarget = scalar, S16, 922, "kPa", 0.03333333333333333,0 ; total TS size = 924 acButtonState = bits, U32, 924, [0:0] m_acEnabled = bits, U32, 924, [1:1] @@ -3933,6 +3934,11 @@ timingIatCorrectionGauge = timingIatCorrection,"timingIatCorrection", "deg", -20 timingPidCorrectionGauge = timingPidCorrection,"timingPidCorrection", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 luaTimingMultGauge = luaTimingMult,"luaTimingMult", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2 + gaugeCategory = "Boost Control" +luaTargetAddGauge = luaTargetAdd,"Boost: Lua Target Add", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostOutputGauge = boostOutput,"Boost: Output", "v", -100.0,100.0, -100.0,100.0, -100.0,100.0, 1,1 +boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 +boostControlTargetGauge = boostControlTarget,"Boost Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = Trigger @@ -4677,7 +4683,8 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = luaTargetAdd, "luaTargetAdd", float, "%.3f" +entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" +entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" entry = openLoopPart, "openLoopPart", float, "%.3f" entry = luaOpenLoopAdd, "luaOpenLoopAdd", float, "%.3f" @@ -5459,10 +5466,11 @@ dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel liveGraph = boost_control_1_Graph, "Graph", South graphLine = luaTargetAdd + graphLine = boostOutput graphLine = luaTargetMult graphLine = openLoopPart - graphLine = luaOpenLoopAdd liveGraph = boost_control_2_Graph, "Graph", South + graphLine = luaOpenLoopAdd graphLine = boostControllerClosedLoopPart graphLine = boostControlTarget diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index 97685a3840..405e8613e7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon Jan 16 13:46:12 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon Jan 16 21:30:42 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class AcControl { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java index 5288d85b29..35974d46b2 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Mon Jan 16 13:46:12 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Mon Jan 16 21:30:42 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class AntilagSystem { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index aba93aaf26..cc978a76b6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Jan 16 20:36:57 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Jan 16 21:30:42 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class BoostControl { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; @@ -409,7 +410,8 @@ public class BoostControl { public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(900); public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(900); public static final Field HASINITBOOST = Field.create("HASINITBOOST", 0, FieldType.BIT, 5).setBaseOffset(900); - public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(900); + public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.INT16).setScale(0.5).setBaseOffset(900); + public static final Field BOOSTOUTPUT = Field.create("BOOSTOUTPUT", 6, FieldType.INT16).setScale(0.5).setBaseOffset(900); public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(900); public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(900); public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(900); @@ -424,6 +426,7 @@ public class BoostControl { ISZERORPM, HASINITBOOST, LUATARGETADD, + BOOSTOUTPUT, LUATARGETMULT, OPENLOOPPART, LUAOPENLOOPADD, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index c89f3edb6b..3a0adb9515 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Jan 16 13:46:12 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Jan 16 21:30:43 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class EngineState { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; 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 a1d0cf409e..20c48cfcaa 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 13:47:07 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jan 16 21:31:37 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -379,6 +379,7 @@ public class Fields { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; @@ -1201,7 +1202,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 2023.01.16.all.snap_13389"; + public static final String TS_SIGNATURE = "rusEFI 2023.01.16.all.snap_13528"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1300; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index 9307598af1..fe20619dab 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Mon Jan 16 13:46:12 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Mon Jan 16 21:30:42 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class FuelComputer { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java index 6487331d6b..084d0eea01 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Mon Jan 16 13:46:12 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Mon Jan 16 21:30:42 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class IgnitionState { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 5039cc677c..df2f9256a7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Mon Jan 16 13:46:12 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Mon Jan 16 21:30:43 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class TriggerState { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index bcb2217168..36c4303850 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Mon Jan 16 13:46:12 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Mon Jan 16 21:30:43 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class TriggerStatePrimary { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index f7afd11ab0..35f6d0a2fe 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Jan 16 13:46:12 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Jan 16 21:30:42 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -103,6 +103,7 @@ public class TsOutputs { public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_CATEGORY_BOOST_CONTROL = "Boost Control"; public static final String GAUGE_CATEGORY_FUEL_MATH = "Fuel: math"; public static final String GAUGE_CATEGORY_TIMING = "Timing"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time";