From 6fc0bbef4e3a02065a578e98ff0490feddc386cc Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Tue, 17 Jan 2023 01:57:05 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 2 +- .../controllers/algo/rusefi_generated.h | 2 +- .../controllers/algo/rusefi_generated.h | 2 +- .../console/binary/generated/data_logs.ini | 5 +- .../binary/generated/fancy_content.ini | 3 + firmware/console/binary/generated/gauges.ini | 2 +- .../binary/generated/output_channels.ini | 17 +++--- .../console/binary/generated/sensors.java | 15 +++-- .../binary/output_channels_generated.h | 48 +++++++-------- .../console/binary_log/log_fields_generated.h | 4 +- .../actuators/boost_control_generated.h | 60 +++++++++---------- .../controllers/generated/rusefi_generated.h | 2 +- .../controllers/generated/signature_48way.h | 2 +- .../controllers/generated/signature_all.h | 2 +- .../generated/signature_alphax-2chan.h | 2 +- .../generated/signature_alphax-4chan.h | 2 +- .../generated/signature_alphax-8chan.h | 2 +- .../controllers/generated/signature_atlas.h | 2 +- .../controllers/generated/signature_core8.h | 2 +- .../controllers/generated/signature_cypress.h | 2 +- .../generated/signature_f407-discovery.h | 2 +- .../generated/signature_f429-discovery.h | 2 +- .../generated/signature_frankenso_na6.h | 2 +- .../generated/signature_harley81.h | 2 +- .../generated/signature_hellen-gm-e67.h | 2 +- .../generated/signature_hellen-nb1.h | 2 +- .../generated/signature_hellen121nissan.h | 2 +- .../generated/signature_hellen121vag.h | 2 +- .../generated/signature_hellen128.h | 2 +- .../generated/signature_hellen154hyundai.h | 2 +- .../generated/signature_hellen72.h | 2 +- .../generated/signature_hellen81.h | 2 +- .../generated/signature_hellen88bmw.h | 2 +- .../generated/signature_hellenNA6.h | 2 +- .../generated/signature_hellenNA8_96.h | 2 +- .../controllers/generated/signature_kin.h | 2 +- .../controllers/generated/signature_m74_9.h | 2 +- .../controllers/generated/signature_mre_f4.h | 2 +- .../controllers/generated/signature_mre_f7.h | 2 +- .../generated/signature_prometheus_405.h | 2 +- .../generated/signature_prometheus_469.h | 2 +- .../generated/signature_proteus_f4.h | 2 +- .../generated/signature_proteus_f7.h | 2 +- .../generated/signature_proteus_h7.h | 2 +- .../controllers/generated/signature_s105.h | 2 +- .../generated/signature_subaru_eg33_f7.h | 2 +- .../generated/signature_tdg-pdm8.h | 2 +- .../lua/generated/output_lookup_generated.cpp | 10 ++-- firmware/tunerstudio/generated/rusefi.ini | 33 +++++----- .../tunerstudio/generated/rusefi_48way.ini | 33 +++++----- .../generated/rusefi_alphax-2chan.ini | 33 +++++----- .../generated/rusefi_alphax-4chan.ini | 33 +++++----- .../generated/rusefi_alphax-8chan.ini | 33 +++++----- .../tunerstudio/generated/rusefi_atlas.ini | 33 +++++----- .../tunerstudio/generated/rusefi_core8.ini | 33 +++++----- .../tunerstudio/generated/rusefi_cypress.ini | 33 +++++----- .../generated/rusefi_f407-discovery.ini | 33 +++++----- .../generated/rusefi_f429-discovery.ini | 33 +++++----- .../generated/rusefi_frankenso_na6.ini | 33 +++++----- .../tunerstudio/generated/rusefi_harley81.ini | 33 +++++----- .../generated/rusefi_hellen-gm-e67.ini | 33 +++++----- .../generated/rusefi_hellen-nb1.ini | 33 +++++----- .../generated/rusefi_hellen121nissan.ini | 33 +++++----- .../generated/rusefi_hellen121vag.ini | 33 +++++----- .../generated/rusefi_hellen128mercedes.ini | 33 +++++----- .../generated/rusefi_hellen154hyundai.ini | 33 +++++----- .../tunerstudio/generated/rusefi_hellen72.ini | 33 +++++----- .../tunerstudio/generated/rusefi_hellen81.ini | 33 +++++----- .../generated/rusefi_hellen88bmw.ini | 33 +++++----- .../generated/rusefi_hellenNA6.ini | 33 +++++----- .../generated/rusefi_hellenNA8_96.ini | 33 +++++----- firmware/tunerstudio/generated/rusefi_kin.ini | 33 +++++----- .../tunerstudio/generated/rusefi_m74_9.ini | 33 +++++----- .../tunerstudio/generated/rusefi_mre_f4.ini | 33 +++++----- .../tunerstudio/generated/rusefi_mre_f7.ini | 33 +++++----- .../generated/rusefi_prometheus_405.ini | 33 +++++----- .../generated/rusefi_prometheus_469.ini | 33 +++++----- .../generated/rusefi_proteus_f4.ini | 33 +++++----- .../generated/rusefi_proteus_f7.ini | 33 +++++----- .../generated/rusefi_proteus_h7.ini | 33 +++++----- .../tunerstudio/generated/rusefi_s105.ini | 33 +++++----- .../generated/rusefi_subaru_eg33_f7.ini | 33 +++++----- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 33 +++++----- .../rusefi/config/generated/BoostControl.java | 10 +++- .../com/rusefi/config/generated/Fields.java | 4 +- .../rusefi/config/generated/TsOutputs.java | 18 +++--- 86 files changed, 803 insertions(+), 626 deletions(-) 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 69d1361955..135134a802 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1320,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_13528" +#define TS_SIGNATURE "rusEFI 2023.01.17.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 20b974faaf..344c8a3939 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1320,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_38420" +#define TS_SIGNATURE "rusEFI 2023.01.17.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 f1ef20695b..48cd019c39 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 @@ -1271,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_60674" +#define TS_SIGNATURE "rusEFI 2023.01.17.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 675d935b96..057543e2c3 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -193,8 +193,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -363,6 +361,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 72268c018d..6f7e29b265 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -107,6 +107,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index faec8cbdc0..fd0c8faed1 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -14,6 +14,6 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 6b4272579c..d6d34ccc68 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -197,13 +197,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -535,8 +533,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 230a3852ce..7d77f97f27 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -168,13 +168,12 @@ vssEdgeCounter("vssEdgeCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 34 issEdgeCounter("issEdgeCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 352, 1.0, -1.0, -1.0, ""), auxLinear1("Aux Linear #1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 356, 0.01, 0.0, 0.0, ""), auxLinear2("Aux Linear #2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 358, 0.01, 0.0, 0.0, ""), -boostControllerOutput("Boost Output", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 364, 0.5, 0.0, 100.0, "%"), -boostControllerOpenLoopPart("Boost Open Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 365, 0.5, 0.0, 100.0, "%"), -fallbackMap("fallbackMap", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 366, 0.1, 0.0, 1000.0, "kPa"), -instantMAPValue("Instant MAP", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 368, 0.03333333333333333, 0.0, 655.0, "kPa"), -maxLockedDuration("maxLockedDuration", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 370, 1.0, 0.0, 65535.0, "us"), -canWriteOk("canWriteOk", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 372, 1.0, -10000.0, 10000.0, ""), -canWriteNotOk("canWriteNotOk", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 374, 1.0, -10000.0, 10000.0, ""), +fallbackMap("fallbackMap", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 364, 0.1, 0.0, 1000.0, "kPa"), +instantMAPValue("Instant MAP", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 366, 0.03333333333333333, 0.0, 655.0, "kPa"), +maxLockedDuration("maxLockedDuration", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 368, 1.0, 0.0, 65535.0, "us"), +canWriteOk("canWriteOk", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 370, 1.0, -10000.0, 10000.0, ""), +canWriteNotOk("canWriteNotOk", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 372, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_374("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 374, 1.0, -20.0, 100.0, "units"), triggerPrimaryFall("triggerPrimaryFall", SensorCategory.SENSOR_INPUTS, FieldType.INT, 376, 1.0, -10000.0, 10000.0, ""), triggerPrimaryRise("triggerPrimaryRise", SensorCategory.SENSOR_INPUTS, FieldType.INT, 380, 1.0, -10000.0, 10000.0, ""), triggerSecondaryFall("triggerSecondaryFall", SensorCategory.SENSOR_INPUTS, FieldType.INT, 384, 1.0, -10000.0, 10000.0, ""), @@ -404,7 +403,7 @@ fuelALSCorrection("fuelALSCorrection", SensorCategory.SENSOR_INPUTS, FieldType.I 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("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"), +boostOutput("Boost: Output", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 906, 0.01, -100.0, 100.0, "percent"), 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, ""), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index b75f79ce50..c0f991af9e 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Jan 15 04:02:37 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Jan 17 01:56:08 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1089,42 +1089,36 @@ struct output_channels_s { /** offset 360 bit 31 */ bool unusedBit_207_31 : 1 {}; - /** - * @@GAUGE_NAME_BOOST_OUTPUT@@ - % - * offset 364 - */ - scaled_channel boostControllerOutput = (uint8_t)0; - /** - * @@GAUGE_NAME_BOOST_OPEN_LOOP@@ - % - * offset 365 - */ - scaled_channel boostControllerOpenLoopPart = (uint8_t)0; /** kPa - * offset 366 + * offset 364 */ scaled_channel fallbackMap = (uint16_t)0; /** * Instant MAP kPa - * offset 368 + * offset 366 */ scaled_channel instantMAPValue = (uint16_t)0; /** us - * offset 370 + * offset 368 */ uint16_t maxLockedDuration = (uint16_t)0; /** - * offset 372 + * offset 370 */ uint16_t canWriteOk = (uint16_t)0; /** - * offset 374 + * offset 372 */ uint16_t canWriteNotOk = (uint16_t)0; + /** + * need 4 byte alignment + units + * offset 374 + */ + uint8_t alignmentFill_at_374[2]; /** * offset 376 */ @@ -1313,28 +1307,28 @@ struct output_channels_s { bool injectorState12 : 1 {}; /** offset 584 bit 24 */ - bool unusedBit_293_24 : 1 {}; + bool unusedBit_292_24 : 1 {}; /** offset 584 bit 25 */ - bool unusedBit_293_25 : 1 {}; + bool unusedBit_292_25 : 1 {}; /** offset 584 bit 26 */ - bool unusedBit_293_26 : 1 {}; + bool unusedBit_292_26 : 1 {}; /** offset 584 bit 27 */ - bool unusedBit_293_27 : 1 {}; + bool unusedBit_292_27 : 1 {}; /** offset 584 bit 28 */ - bool unusedBit_293_28 : 1 {}; + bool unusedBit_292_28 : 1 {}; /** offset 584 bit 29 */ - bool unusedBit_293_29 : 1 {}; + bool unusedBit_292_29 : 1 {}; /** offset 584 bit 30 */ - bool unusedBit_293_30 : 1 {}; + bool unusedBit_292_30 : 1 {}; /** offset 584 bit 31 */ - bool unusedBit_293_31 : 1 {}; + bool unusedBit_292_31 : 1 {}; /** * offset 588 */ @@ -1377,4 +1371,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 748); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Jan 15 04:02:37 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Jan 17 01:56:08 UTC 2023 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index dc1e605741..90bcddf8de 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -168,8 +168,6 @@ static constexpr LogField fields[] = { {engine->outputChannels.issEdgeCounter, "issEdgeCounter", "", 0}, {engine->outputChannels.auxLinear1, "Aux Linear #1", "", 2}, {engine->outputChannels.auxLinear2, "Aux Linear #2", "", 2}, - {engine->outputChannels.boostControllerOutput, "Boost Output", "%", 1}, - {engine->outputChannels.boostControllerOpenLoopPart, "Boost Open Loop", "%", 1}, {engine->outputChannels.fallbackMap, "fallbackMap", "kPa", 1}, {engine->outputChannels.instantMAPValue, "Instant MAP", "kPa", 2}, {engine->outputChannels.maxLockedDuration, "maxLockedDuration", "us", 0}, @@ -271,7 +269,7 @@ static constexpr LogField fields[] = { {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.boostOutput, "Boost: Output", "percent", 2}, {engine->boostController.luaTargetMult, "luaTargetMult", "", 0}, {engine->boostController.openLoopPart, "openLoopPart", "", 0}, {engine->boostController.luaOpenLoopAdd, "luaOpenLoopAdd", "", 0}, diff --git a/firmware/controllers/actuators/boost_control_generated.h b/firmware/controllers/actuators/boost_control_generated.h index 9a3048ca1c..0c050d3181 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 21:30:42 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Tue Jan 17 01:56:08 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -25,82 +25,82 @@ struct boost_control_s { bool hasInitBoost : 1 {}; /** offset 0 bit 6 */ - bool unusedBit_6_6 : 1 {}; + bool rpmTooLow : 1 {}; /** offset 0 bit 7 */ - bool unusedBit_6_7 : 1 {}; + bool tpsTooLow : 1 {}; /** offset 0 bit 8 */ - bool unusedBit_6_8 : 1 {}; + bool mapTooLow : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_6_9 : 1 {}; + bool unusedBit_9_9 : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_6_10 : 1 {}; + bool unusedBit_9_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_6_11 : 1 {}; + bool unusedBit_9_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_6_12 : 1 {}; + bool unusedBit_9_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_6_13 : 1 {}; + bool unusedBit_9_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_6_14 : 1 {}; + bool unusedBit_9_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_6_15 : 1 {}; + bool unusedBit_9_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_6_16 : 1 {}; + bool unusedBit_9_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_6_17 : 1 {}; + bool unusedBit_9_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_6_18 : 1 {}; + bool unusedBit_9_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_6_19 : 1 {}; + bool unusedBit_9_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_6_20 : 1 {}; + bool unusedBit_9_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_6_21 : 1 {}; + bool unusedBit_9_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_6_22 : 1 {}; + bool unusedBit_9_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_6_23 : 1 {}; + bool unusedBit_9_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_6_24 : 1 {}; + bool unusedBit_9_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_6_25 : 1 {}; + bool unusedBit_9_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_6_26 : 1 {}; + bool unusedBit_9_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_6_27 : 1 {}; + bool unusedBit_9_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_6_28 : 1 {}; + bool unusedBit_9_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_6_29 : 1 {}; + bool unusedBit_9_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_6_30 : 1 {}; + bool unusedBit_9_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_6_31 : 1 {}; + bool unusedBit_9_31 : 1 {}; /** * "Boost: Lua Target Add" v @@ -109,10 +109,10 @@ struct boost_control_s { scaled_channel luaTargetAdd = (int16_t)0; /** * "Boost: Output" - v + percent * offset 6 */ - scaled_channel boostOutput = (int16_t)0; + scaled_channel boostOutput = (int16_t)0; /** * offset 8 */ @@ -147,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 21:30:42 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Tue Jan 17 01:56:08 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 2addafe5b3..c57d28faa2 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1320,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_13528" +#define TS_SIGNATURE "rusEFI 2023.01.17.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 ef372b5234..28b7a09289 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_15511 -#define TS_SIGNATURE "rusEFI 2023.01.16.48way.snap_15511" +#define TS_SIGNATURE "rusEFI 2023.01.17.48way.snap_15511" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index f46a2c2bdf..ff13003865 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_13528 -#define TS_SIGNATURE "rusEFI 2023.01.16.all.snap_13528" +#define TS_SIGNATURE "rusEFI 2023.01.17.all.snap_13528" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index d63b3a470c..73898ef164 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_43444 -#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-2chan.snap_43444" +#define TS_SIGNATURE "rusEFI 2023.01.17.alphax-2chan.snap_43444" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index ef1880c2de..48d619dd16 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_9713 -#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-4chan.snap_9713" +#define TS_SIGNATURE "rusEFI 2023.01.17.alphax-4chan.snap_9713" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 26187b375e..d0b389f632 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_43860 -#define TS_SIGNATURE "rusEFI 2023.01.16.alphax-8chan.snap_43860" +#define TS_SIGNATURE "rusEFI 2023.01.17.alphax-8chan.snap_43860" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 5af8a4c2c0..f7d68b72f4 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_49663 -#define TS_SIGNATURE "rusEFI 2023.01.16.atlas.snap_49663" +#define TS_SIGNATURE "rusEFI 2023.01.17.atlas.snap_49663" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 0ce0d45009..880278d714 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_25889 -#define TS_SIGNATURE "rusEFI 2023.01.16.core8.snap_25889" +#define TS_SIGNATURE "rusEFI 2023.01.17.core8.snap_25889" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 8085e114a9..331ca6ec06 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_13528 -#define TS_SIGNATURE "rusEFI 2023.01.16.cypress.snap_13528" +#define TS_SIGNATURE "rusEFI 2023.01.17.cypress.snap_13528" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index f75e14649e..2fa43c5b52 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_13528 -#define TS_SIGNATURE "rusEFI 2023.01.16.f407-discovery.snap_13528" +#define TS_SIGNATURE "rusEFI 2023.01.17.f407-discovery.snap_13528" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index ad9b2f8f82..f670588ef8 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_13528 -#define TS_SIGNATURE "rusEFI 2023.01.16.f429-discovery.snap_13528" +#define TS_SIGNATURE "rusEFI 2023.01.17.f429-discovery.snap_13528" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6669fd596a..aca9ae6204 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_51228 -#define TS_SIGNATURE "rusEFI 2023.01.16.frankenso_na6.snap_51228" +#define TS_SIGNATURE "rusEFI 2023.01.17.frankenso_na6.snap_51228" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index f1f17e1052..942f73f2b5 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_29223 -#define TS_SIGNATURE "rusEFI 2023.01.16.harley81.snap_29223" +#define TS_SIGNATURE "rusEFI 2023.01.17.harley81.snap_29223" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 8217973c44..3bfa51e840 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_22492 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen-gm-e67.snap_22492" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen-gm-e67.snap_22492" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index f603e0ca20..05c9a2b236 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_1300 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen-nb1.snap_1300" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen-nb1.snap_1300" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index a1ab74adba..1570f7490a 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_51530 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen121nissan.snap_51530" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen121nissan.snap_51530" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 1a85e684b5..9492a8af62 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_41925 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen121vag.snap_41925" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen121vag.snap_41925" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 09fab087c7..f55355472f 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_18915 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen128.snap_18915" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen128.snap_18915" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index b483e22996..b3d35024e7 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_3643 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen154hyundai.snap_3643" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen154hyundai.snap_3643" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 7cb0d5d179..6d7fa46a3c 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_14931 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen72.snap_14931" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen72.snap_14931" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index f77ecaaf10..0270e65e75 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_43685 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen81.snap_43685" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen81.snap_43685" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index de62549aaa..cf275fa575 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_10004 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellen88bmw.snap_10004" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellen88bmw.snap_10004" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index e7bd1f2554..64929d45d6 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_34287 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellenNA6.snap_34287" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellenNA6.snap_34287" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 6772813857..cf02bc9451 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_34096 -#define TS_SIGNATURE "rusEFI 2023.01.16.hellenNA8_96.snap_34096" +#define TS_SIGNATURE "rusEFI 2023.01.17.hellenNA8_96.snap_34096" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 71c4b5bc30..d3e1136133 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_38420 -#define TS_SIGNATURE "rusEFI 2023.01.16.kin.snap_38420" +#define TS_SIGNATURE "rusEFI 2023.01.17.kin.snap_38420" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 689b37df36..892e12a415 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_59875 -#define TS_SIGNATURE "rusEFI 2023.01.16.m74_9.snap_59875" +#define TS_SIGNATURE "rusEFI 2023.01.17.m74_9.snap_59875" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 4d4a49e599..33f4586e6b 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_21464 -#define TS_SIGNATURE "rusEFI 2023.01.16.mre_f4.snap_21464" +#define TS_SIGNATURE "rusEFI 2023.01.17.mre_f4.snap_21464" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index c6363a9afc..5f993bfb95 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_21464 -#define TS_SIGNATURE "rusEFI 2023.01.16.mre_f7.snap_21464" +#define TS_SIGNATURE "rusEFI 2023.01.17.mre_f7.snap_21464" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 08212f770f..e2f47b0582 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_60734 -#define TS_SIGNATURE "rusEFI 2023.01.16.prometheus_405.snap_60734" +#define TS_SIGNATURE "rusEFI 2023.01.17.prometheus_405.snap_60734" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 225196936f..36b614d72d 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_60734 -#define TS_SIGNATURE "rusEFI 2023.01.16.prometheus_469.snap_60734" +#define TS_SIGNATURE "rusEFI 2023.01.17.prometheus_469.snap_60734" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 779ff73409..a967eb05a8 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_65384 -#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_f4.snap_65384" +#define TS_SIGNATURE "rusEFI 2023.01.17.proteus_f4.snap_65384" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 88e6b8041e..0ce65f82bc 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_65384 -#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_f7.snap_65384" +#define TS_SIGNATURE "rusEFI 2023.01.17.proteus_f7.snap_65384" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 026856ee3e..887d16949c 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_65384 -#define TS_SIGNATURE "rusEFI 2023.01.16.proteus_h7.snap_65384" +#define TS_SIGNATURE "rusEFI 2023.01.17.proteus_h7.snap_65384" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 4748999d28..861d229180 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_38687 -#define TS_SIGNATURE "rusEFI 2023.01.16.s105.snap_38687" +#define TS_SIGNATURE "rusEFI 2023.01.17.s105.snap_38687" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 71c940f2c0..071636872f 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_60674 -#define TS_SIGNATURE "rusEFI 2023.01.16.subaru_eg33_f7.snap_60674" +#define TS_SIGNATURE "rusEFI 2023.01.17.subaru_eg33_f7.snap_60674" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index c0e5f33381..1c6ad7e94c 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -3,4 +3,4 @@ // #define SIGNATURE_HASH snap_64140 -#define TS_SIGNATURE "rusEFI 2023.01.16.tdg-pdm8.snap_64140" +#define TS_SIGNATURE "rusEFI 2023.01.17.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 ac7225aa97..8907d8e814 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -325,10 +325,6 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.dfcoActive; case 1506646480: return engine->outputChannels.tpsAccelActive; - case 190940033: - return engine->outputChannels.boostControllerOutput; - case -1563675693: - return engine->outputChannels.boostControllerOpenLoopPart; case -940825965: return engine->outputChannels.fallbackMap; case -1162308767: @@ -531,6 +527,12 @@ float getOutputValueByName(const char *name) { return engine->boostController.isZeroRpm; case -2011570052: return engine->boostController.hasInitBoost; + case 193830616: + return engine->boostController.rpmTooLow; + case -1033638560: + return engine->boostController.tpsTooLow; + case -734877977: + return engine->boostController.mapTooLow; case 119157463: return engine->boostController.luaTargetAdd; case 1239062717: diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 83db56f8f4..9dc10ecaed 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_13528" + signature = "rusEFI 2023.01.17.all.snap_13528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.all.snap_13528" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:34 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:50 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5461,6 +5463,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index c290828977..3172995852 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_15511" + signature = "rusEFI 2023.01.17.48way.snap_15511" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.48way.snap_15511" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:15 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:34 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5459,6 +5461,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 2681e80910..686268cc25 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_43444" + signature = "rusEFI 2023.01.17.alphax-2chan.snap_43444" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.alphax-2chan.snap_43444" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:47 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:12 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5455,6 +5457,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index d7faaf256b..d05ca516d0 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_9713" + signature = "rusEFI 2023.01.17.alphax-4chan.snap_9713" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.alphax-4chan.snap_9713" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:49 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:13 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index ca5a59c7d0..2d38c84d5f 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_43860" + signature = "rusEFI 2023.01.17.alphax-8chan.snap_43860" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.alphax-8chan.snap_43860" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:50 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:15 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 0d5af88972..aa610dd13d 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_49663" + signature = "rusEFI 2023.01.17.atlas.snap_49663" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.atlas.snap_49663" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:32 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:48 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5461,6 +5463,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index e3879ac688..ea4a7ce764 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_25889" + signature = "rusEFI 2023.01.17.core8.snap_25889" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.core8.snap_25889" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:13 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:33 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5459,6 +5461,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 7ac9e874a4..43f02c4a2c 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_13528" + signature = "rusEFI 2023.01.17.cypress.snap_13528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.cypress.snap_13528" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:45 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jan 17 01:56:10 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5461,6 +5463,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 2c331d55c7..6e9ed78582 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_13528" + signature = "rusEFI 2023.01.17.f407-discovery.snap_13528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.f407-discovery.snap_13528" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:29 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:45 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5461,6 +5463,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 3c32466689..08c3871df9 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_13528" + signature = "rusEFI 2023.01.17.f429-discovery.snap_13528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.f429-discovery.snap_13528" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:30 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:46 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5461,6 +5463,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index c70fe18673..6eccd6fe00 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_51228" + signature = "rusEFI 2023.01.17.frankenso_na6.snap_51228" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.frankenso_na6.snap_51228" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:19 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:38 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5461,6 +5463,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 9314d43896..cf5742cdfc 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_29223" + signature = "rusEFI 2023.01.17.harley81.snap_29223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.harley81.snap_29223" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:52 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:16 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 7be01b970b..c40c0051ea 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_22492" + signature = "rusEFI 2023.01.17.hellen-gm-e67.snap_22492" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen-gm-e67.snap_22492" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:06 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:27 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 33ca545801..ddb0edc1e3 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_1300" + signature = "rusEFI 2023.01.17.hellen-nb1.snap_1300" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen-nb1.snap_1300" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:04 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:26 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index a0daf32bfb..d735f13ccf 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_51530" + signature = "rusEFI 2023.01.17.hellen121nissan.snap_51530" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen121nissan.snap_51530" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:56 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:20 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 6a45a77696..d6b30e44cb 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_41925" + signature = "rusEFI 2023.01.17.hellen121vag.snap_41925" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen121vag.snap_41925" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:55 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:18 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index f3e47bbeb5..6aadeea3f2 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_18915" + signature = "rusEFI 2023.01.17.hellen128.snap_18915" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen128.snap_18915" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:53 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:17 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 9b2c1d1cbd..81a5610c21 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_3643" + signature = "rusEFI 2023.01.17.hellen154hyundai.snap_3643" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen154hyundai.snap_3643" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:58 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:21 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 43b73a38be..bb7bed1d55 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_14931" + signature = "rusEFI 2023.01.17.hellen72.snap_14931" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen72.snap_14931" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:01 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:23 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index e26dbd2db5..68db05b145 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_43685" + signature = "rusEFI 2023.01.17.hellen81.snap_43685" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen81.snap_43685" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:03 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:24 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5456,6 +5458,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 2086e46c2d..0caa4d8872 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_10004" + signature = "rusEFI 2023.01.17.hellen88bmw.snap_10004" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellen88bmw.snap_10004" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:59 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:22 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 6399690936..f192000761 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_34287" + signature = "rusEFI 2023.01.17.hellenNA6.snap_34287" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellenNA6.snap_34287" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:07 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:28 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 9f4b0f2fb2..207d5b52ec 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_34096" + signature = "rusEFI 2023.01.17.hellenNA8_96.snap_34096" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.hellenNA8_96.snap_34096" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:09 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:29 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index e1b3272ac2..f9ec6edb6f 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_38420" + signature = "rusEFI 2023.01.17.kin.snap_38420" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.kin.snap_38420" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:43 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jan 17 01:56:09 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5461,6 +5463,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 1cd6e1f2a7..7ca0a97abb 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_59875" + signature = "rusEFI 2023.01.17.m74_9.snap_59875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.m74_9.snap_59875" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:16 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:36 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 4ba0ecb70b..4606664a28 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_21464" + signature = "rusEFI 2023.01.17.mre_f4.snap_21464" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.mre_f4.snap_21464" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:12 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:32 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5459,6 +5461,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 6eb2215343..f501f86c3d 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_21464" + signature = "rusEFI 2023.01.17.mre_f7.snap_21464" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.mre_f7.snap_21464" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:10 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:31 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5459,6 +5461,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a9a2664651..8e994b3280 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_60734" + signature = "rusEFI 2023.01.17.prometheus_405.snap_60734" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.prometheus_405.snap_60734" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:40 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5455,6 +5457,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 175ca78616..cfb0c021d0 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_60734" + signature = "rusEFI 2023.01.17.prometheus_469.snap_60734" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.prometheus_469.snap_60734" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:21 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:39 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5455,6 +5457,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d45ccdcf61..29ab2f5d24 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_65384" + signature = "rusEFI 2023.01.17.proteus_f4.snap_65384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.proteus_f4.snap_65384" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:26 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:43 UTC 2023 pageSize = 26368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5455,6 +5457,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index def3553c9b..c2bba3e9b3 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_65384" + signature = "rusEFI 2023.01.17.proteus_f7.snap_65384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.proteus_f7.snap_65384" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:24 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:41 UTC 2023 pageSize = 26368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5455,6 +5457,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index c144f4e73e..7b5d756f5a 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_65384" + signature = "rusEFI 2023.01.17.proteus_h7.snap_65384" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.proteus_h7.snap_65384" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:27 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:44 UTC 2023 pageSize = 26368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5455,6 +5457,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 63330f4d55..2730250ae5 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_38687" + signature = "rusEFI 2023.01.17.s105.snap_38687" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.s105.snap_38687" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:18 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:37 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5458,6 +5460,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 49d320dc2c..9d9cd8b5c2 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_60674" + signature = "rusEFI 2023.01.17.subaru_eg33_f7.snap_60674" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.subaru_eg33_f7.snap_60674" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:30:46 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 Tue Jan 17 01:56:11 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5457,6 +5459,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 3a74b1bfce..786a4017b8 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_64140" + signature = "rusEFI 2023.01.17.tdg-pdm8.snap_64140" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2023.01.16.tdg-pdm8.snap_64140" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2023.01.17.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 21:31:33 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:49 UTC 2023 pageSize = 22368 page = 1 @@ -2412,13 +2412,11 @@ auxLinear1 = scalar, S16, 356, "", 0.01, 0 auxLinear2 = scalar, S16, 358, "", 0.01, 0 dfcoActive = bits, U32, 360, [0:0] tpsAccelActive = bits, U32, 360, [1:1] -boostControllerOutput = scalar, U08, 364, "%", 0.5, 0 -boostControllerOpenLoopPart = scalar, U08, 365, "%", 0.5, 0 -fallbackMap = scalar, U16, 366, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 368, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 370, "us", 1, 0 -canWriteOk = scalar, U16, 372, "", 1, 0 -canWriteNotOk = scalar, U16, 374, "", 1, 0 +fallbackMap = scalar, U16, 364, "kPa", 0.1, 0 +instantMAPValue = scalar, U16, 366, "kPa", 0.03333333333333333, 0 +maxLockedDuration = scalar, U16, 368, "us", 1, 0 +canWriteOk = scalar, U16, 370, "", 1, 0 +canWriteNotOk = scalar, U16, 372, "", 1, 0 triggerPrimaryFall = scalar, U32, 376, "", 1, 0 triggerPrimaryRise = scalar, U32, 380, "", 1, 0 triggerSecondaryFall = scalar, U32, 384, "", 1, 0 @@ -2750,8 +2748,11 @@ isBelowClosedLoopThreshold = bits, U32, 900, [2:2] isNotClosedLoop = bits, U32, 900, [3:3] isZeroRpm = bits, U32, 900, [4:4] hasInitBoost = bits, U32, 900, [5:5] +rpmTooLow = bits, U32, 900, [6:6] +tpsTooLow = bits, U32, 900, [7:7] +mapTooLow = bits, U32, 900, [8:8] luaTargetAdd = scalar, S16, 904, "v", 0.5,0 -boostOutput = scalar, S16, 906, "v", 0.5,0 +boostOutput = scalar, S16, 906, "percent", 0.01,0 luaTargetMult = scalar, F32, 908, "", 1, 0 openLoopPart = scalar, F32, 912, "", 1, 0 luaOpenLoopAdd = scalar, F32, 916, "", 1, 0 @@ -3936,7 +3937,7 @@ luaTimingAddGauge = luaTimingAdd,"luaTimingAdd", "deg", -20.0,20.0, -20.0,20.0, 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 +boostOutputGauge = boostOutput,"Boost: Output", "percent", -100.0,100.0, -100.0,100.0, -100.0,100.0, 2,2 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 @@ -4513,8 +4514,6 @@ entry = auxLinear1, "Aux Linear #1", float, "%.3f" entry = auxLinear2, "Aux Linear #2", float, "%.3f" entry = dfcoActive, "dfcoActive", int, "%d" entry = tpsAccelActive, "tpsAccelActive", int, "%d" -entry = boostControllerOutput, "Boost Output", float, "%.3f" -entry = boostControllerOpenLoopPart, "Boost Open Loop", float, "%.3f" entry = fallbackMap, "fallbackMap", float, "%.3f" entry = instantMAPValue, "Instant MAP", float, "%.3f" entry = maxLockedDuration, "maxLockedDuration", int, "%d" @@ -4683,6 +4682,9 @@ entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" entry = isZeroRpm, "isZeroRpm", int, "%d" entry = hasInitBoost, "hasInitBoost", int, "%d" +entry = rpmTooLow, "rpmTooLow", int, "%d" +entry = tpsTooLow, "tpsTooLow", int, "%d" +entry = mapTooLow, "mapTooLow", int, "%d" entry = luaTargetAdd, "Boost: Lua Target Add", float, "%.3f" entry = boostOutput, "Boost: Output", float, "%.3f" entry = luaTargetMult, "luaTargetMult", float, "%.3f" @@ -5461,6 +5463,9 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" + indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" + indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" + indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel 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 cc978a76b6..e7f6bd78f0 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 21:30:42 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Tue Jan 17 01:56:08 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -410,8 +410,11 @@ 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 RPMTOOLOW = Field.create("RPMTOOLOW", 0, FieldType.BIT, 6).setBaseOffset(900); + public static final Field TPSTOOLOW = Field.create("TPSTOOLOW", 0, FieldType.BIT, 7).setBaseOffset(900); + public static final Field MAPTOOLOW = Field.create("MAPTOOLOW", 0, FieldType.BIT, 8).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 BOOSTOUTPUT = Field.create("BOOSTOUTPUT", 6, FieldType.INT16).setScale(0.01).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); @@ -425,6 +428,9 @@ public class BoostControl { ISNOTCLOSEDLOOP, ISZERORPM, HASINITBOOST, + RPMTOOLOW, + TPSTOOLOW, + MAPTOOLOW, LUATARGETADD, BOOSTOUTPUT, LUATARGETMULT, 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 20c48cfcaa..39eeda2732 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 21:31:37 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jan 17 01:56:52 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1202,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_13528"; + public static final String TS_SIGNATURE = "rusEFI 2023.01.17.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/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 35f6d0a2fe..ce386252b3 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 21:30:42 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Jan 17 01:56:08 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -601,13 +601,12 @@ public class TsOutputs { public static final Field AUXLINEAR2 = Field.create("AUXLINEAR2", 358, FieldType.INT16).setScale(0.01).setBaseOffset(0); public static final Field DFCOACTIVE = Field.create("DFCOACTIVE", 360, FieldType.BIT, 0).setBaseOffset(0); public static final Field TPSACCELACTIVE = Field.create("TPSACCELACTIVE", 360, FieldType.BIT, 1).setBaseOffset(0); - public static final Field BOOSTCONTROLLEROUTPUT = Field.create("BOOSTCONTROLLEROUTPUT", 364, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field BOOSTCONTROLLEROPENLOOPPART = Field.create("BOOSTCONTROLLEROPENLOOPPART", 365, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field FALLBACKMAP = Field.create("FALLBACKMAP", 366, FieldType.INT16).setScale(0.1).setBaseOffset(0); - public static final Field INSTANTMAPVALUE = Field.create("INSTANTMAPVALUE", 368, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(0); - public static final Field MAXLOCKEDDURATION = Field.create("MAXLOCKEDDURATION", 370, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field CANWRITEOK = Field.create("CANWRITEOK", 372, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field CANWRITENOTOK = Field.create("CANWRITENOTOK", 374, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field FALLBACKMAP = Field.create("FALLBACKMAP", 364, FieldType.INT16).setScale(0.1).setBaseOffset(0); + public static final Field INSTANTMAPVALUE = Field.create("INSTANTMAPVALUE", 366, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(0); + public static final Field MAXLOCKEDDURATION = Field.create("MAXLOCKEDDURATION", 368, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field CANWRITEOK = Field.create("CANWRITEOK", 370, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field CANWRITENOTOK = Field.create("CANWRITENOTOK", 372, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field ALIGNMENTFILL_AT_374 = Field.create("ALIGNMENTFILL_AT_374", 374, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field TRIGGERPRIMARYFALL = Field.create("TRIGGERPRIMARYFALL", 376, FieldType.INT).setScale(1.0).setBaseOffset(0); public static final Field TRIGGERPRIMARYRISE = Field.create("TRIGGERPRIMARYRISE", 380, FieldType.INT).setScale(1.0).setBaseOffset(0); public static final Field TRIGGERSECONDARYFALL = Field.create("TRIGGERSECONDARYFALL", 384, FieldType.INT).setScale(1.0).setBaseOffset(0); @@ -1064,13 +1063,12 @@ public class TsOutputs { AUXLINEAR2, DFCOACTIVE, TPSACCELACTIVE, - BOOSTCONTROLLEROUTPUT, - BOOSTCONTROLLEROPENLOOPPART, FALLBACKMAP, INSTANTMAPVALUE, MAXLOCKEDDURATION, CANWRITEOK, CANWRITENOTOK, + ALIGNMENTFILL_AT_374, TRIGGERPRIMARYFALL, TRIGGERPRIMARYRISE, TRIGGERSECONDARYFALL,