diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index eb3e4d73d0..2be0b773ab 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1946,7 +1946,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1062192935 +#define SIGNATURE_HASH 2880801794 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2501,12 +2501,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen_cypress.1062192935" +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen_cypress.2880801794" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1032 +#define TS_TOTAL_OUTPUT_SIZE 1040 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 1969c29e07..028fb994ff 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1932,7 +1932,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1628217514 +#define SIGNATURE_HASH 4126600079 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2487,12 +2487,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.10.kin.1628217514" +#define TS_SIGNATURE "rusEFI 2022.08.10.kin.4126600079" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1032 +#define TS_TOTAL_OUTPUT_SIZE 1040 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index c7008c8c2e..375fa9381d 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 @@ -1912,7 +1912,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1903325343 +#define SIGNATURE_HASH 3850910650 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2468,12 +2468,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.10.subaru_eg33_f7.1903325343" +#define TS_SIGNATURE "rusEFI 2022.08.10.subaru_eg33_f7.3850910650" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1032 +#define TS_TOTAL_OUTPUT_SIZE 1040 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 45c07b9b0b..553c5bc5e6 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -432,6 +432,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 8e103feaf9..c07e25c277 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -255,6 +255,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index e454382a8b..d76aa36600 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -508,23 +508,25 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index cee61965c7..54f0893376 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -301,21 +301,23 @@ iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUT throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, -1.0, -1.0, ""), targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1020, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1021, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1022, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1023, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1024, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1026, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1028, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1030, 1.0, -20.0, 100.0, "units"), +airTaperRpmRange("RPM range above upper limit for extra air taper", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), +airByRpmTaper("Extra air taper amount", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1024, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1028, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1029, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1030, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1031, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1032, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1034, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1036, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1038, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 36fb64f716..48b2f54dab 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / UsagesReader.java -#define TS_TOTAL_OUTPUT_SIZE 1032 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1040 \ No newline at end of file diff --git a/firmware/controllers/actuators/idle_state_generated.h b/firmware/controllers/actuators/idle_state_generated.h index 8659ce8cc5..e338b375a5 100644 --- a/firmware/controllers/actuators/idle_state_generated.h +++ b/firmware/controllers/actuators/idle_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Fri Jul 08 05:13:11 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Aug 10 05:43:37 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -150,8 +150,18 @@ struct idle_state_s { * offset 28 */ int targetRpmAcBump = (int)0; + /** + * RPM range above upper limit for extra air taper + * offset 32 + */ + int airTaperRpmRange = (int)0; + /** + * Extra air taper amount + * offset 36 + */ + percent_t airByRpmTaper = (percent_t)0; }; -static_assert(sizeof(idle_state_s) == 32); +static_assert(sizeof(idle_state_s) == 40); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Fri Jul 08 05:13:11 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Aug 10 05:43:37 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 18a1181832..8e32611e8a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1946,7 +1946,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2053343533 +#define SIGNATURE_HASH 4003054088 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2501,12 +2501,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.08.10.all.2053343533" +#define TS_SIGNATURE "rusEFI 2022.08.10.all.4003054088" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1032 +#define TS_TOTAL_OUTPUT_SIZE 1040 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 2ec3db2714..bdd867c713 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1833206114 -#define TS_SIGNATURE "rusEFI 2022.08.10.48way.1833206114" +#define SIGNATURE_HASH 4190030407 +#define TS_SIGNATURE "rusEFI 2022.08.10.48way.4190030407" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 71f2137dab..14a3f38d63 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2053343533 -#define TS_SIGNATURE "rusEFI 2022.08.10.all.2053343533" +#define SIGNATURE_HASH 4003054088 +#define TS_SIGNATURE "rusEFI 2022.08.10.all.4003054088" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 113ffeb99d..95c55563c2 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1215370305 -#define TS_SIGNATURE "rusEFI 2022.08.10.alphax-2chan.1215370305" +#define SIGNATURE_HASH 3700121444 +#define TS_SIGNATURE "rusEFI 2022.08.10.alphax-2chan.3700121444" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 842f4807ec..968131f6c9 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1508861550 -#define TS_SIGNATURE "rusEFI 2022.08.10.alphax-4chan.1508861550" +#define SIGNATURE_HASH 3440717131 +#define TS_SIGNATURE "rusEFI 2022.08.10.alphax-4chan.3440717131" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 034546c184..0ddd3b3ba9 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1722383370 -#define TS_SIGNATURE "rusEFI 2022.08.10.atlas.1722383370" +#define SIGNATURE_HASH 4065539887 +#define TS_SIGNATURE "rusEFI 2022.08.10.atlas.4065539887" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 046e8ea29a..b68bee67c0 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2358237396 -#define TS_SIGNATURE "rusEFI 2022.08.10.core8.2358237396" +#define SIGNATURE_HASH 410358769 +#define TS_SIGNATURE "rusEFI 2022.08.10.core8.410358769" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 8589ae0d85..a797ae58b0 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2053343533 -#define TS_SIGNATURE "rusEFI 2022.08.10.f407-discovery.2053343533" +#define SIGNATURE_HASH 4003054088 +#define TS_SIGNATURE "rusEFI 2022.08.10.f407-discovery.4003054088" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index abd3576541..7350c3bbdd 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2053343533 -#define TS_SIGNATURE "rusEFI 2022.08.10.f429-discovery.2053343533" +#define SIGNATURE_HASH 4003054088 +#define TS_SIGNATURE "rusEFI 2022.08.10.f429-discovery.4003054088" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 90225fcb3d..81b6937be6 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 940537321 -#define TS_SIGNATURE "rusEFI 2022.08.10.frankenso_na6.940537321" +#define SIGNATURE_HASH 2901753548 +#define TS_SIGNATURE "rusEFI 2022.08.10.frankenso_na6.2901753548" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index c1ee66a699..345f2d90d3 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 244307538 -#define TS_SIGNATURE "rusEFI 2022.08.10.harley81.244307538" +#define SIGNATURE_HASH 2591399287 +#define TS_SIGNATURE "rusEFI 2022.08.10.harley81.2591399287" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 900f3456e6..db5fa455c4 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1533843528 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen-gm-e67.1533843528" +#define SIGNATURE_HASH 3482768237 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen-gm-e67.3482768237" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index de5aefd14d..3ce3af873a 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2749937889 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen-nb1.2749937889" +#define SIGNATURE_HASH 923988932 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen-nb1.923988932" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 0bbef0a336..bb9f658a93 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4072485319 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen121nissan.4072485319" +#define SIGNATURE_HASH 1715960546 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen121nissan.1715960546" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index e642a6ce03..5212516777 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 172116567 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen121vag.172116567" +#define SIGNATURE_HASH 2662859122 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen121vag.2662859122" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index ed83c0f42e..1966250bfb 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2224927763 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen128.2224927763" +#define SIGNATURE_HASH 275250998 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen128.275250998" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 71cdd2e0f4..226471ca95 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3794598825 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen154hyundai.3794598825" +#define SIGNATURE_HASH 1993781388 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen154hyundai.1993781388" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 86cb129465..00890862b6 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2287771689 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen72.2287771689" +#define SIGNATURE_HASH 480701196 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen72.480701196" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 9ee2186062..2b900d01a1 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1490440487 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen81.1490440487" +#define SIGNATURE_HASH 3425442306 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen81.3425442306" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 9bd2097f12..f371057981 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1872141025 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen88bmw.1872141025" +#define SIGNATURE_HASH 4218212804 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen88bmw.4218212804" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index bc348cea50..ac2e94bead 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4175984717 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellenNA6.4175984717" +#define SIGNATURE_HASH 1813132136 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellenNA6.1813132136" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 6ffac7fc3b..dc6c84ff72 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2027574045 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellenNA8_96.2027574045" +#define SIGNATURE_HASH 3961526328 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellenNA8_96.3961526328" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index d002c7d85e..29511a49af 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1062192935 -#define TS_SIGNATURE "rusEFI 2022.08.10.hellen_cypress.1062192935" +#define SIGNATURE_HASH 2880801794 +#define TS_SIGNATURE "rusEFI 2022.08.10.hellen_cypress.2880801794" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 3919b3c2fe..a4a43f65e3 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 1628217514 -#define TS_SIGNATURE "rusEFI 2022.08.10.kin.1628217514" +#define SIGNATURE_HASH 4126600079 +#define TS_SIGNATURE "rusEFI 2022.08.10.kin.4126600079" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index ebf4ca7e37..4cb906fe69 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3048539611 -#define TS_SIGNATURE "rusEFI 2022.08.10.mre_f4.3048539611" +#define SIGNATURE_HASH 558845694 +#define TS_SIGNATURE "rusEFI 2022.08.10.mre_f4.558845694" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a7442dd0fc..18aeda1f69 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3048539611 -#define TS_SIGNATURE "rusEFI 2022.08.10.mre_f7.3048539611" +#define SIGNATURE_HASH 558845694 +#define TS_SIGNATURE "rusEFI 2022.08.10.mre_f7.558845694" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 6930859df1..2b5ad5807a 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 713642187 -#define TS_SIGNATURE "rusEFI 2022.08.10.prometheus_405.713642187" +#define SIGNATURE_HASH 3195214830 +#define TS_SIGNATURE "rusEFI 2022.08.10.prometheus_405.3195214830" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 336af92da3..6aaf8dc824 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 713642187 -#define TS_SIGNATURE "rusEFI 2022.08.10.prometheus_469.713642187" +#define SIGNATURE_HASH 3195214830 +#define TS_SIGNATURE "rusEFI 2022.08.10.prometheus_469.3195214830" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 615867fd6b..0bc24a6bc4 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3752742491 -#define TS_SIGNATURE "rusEFI 2022.08.10.proteus_f4.3752742491" +#define SIGNATURE_HASH 1263797630 +#define TS_SIGNATURE "rusEFI 2022.08.10.proteus_f4.1263797630" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index bac1100fbe..92b785ad66 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3752742491 -#define TS_SIGNATURE "rusEFI 2022.08.10.proteus_f7.3752742491" +#define SIGNATURE_HASH 1263797630 +#define TS_SIGNATURE "rusEFI 2022.08.10.proteus_f7.1263797630" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 971de32ebb..002375d566 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3752742491 -#define TS_SIGNATURE "rusEFI 2022.08.10.proteus_h7.3752742491" +#define SIGNATURE_HASH 1263797630 +#define TS_SIGNATURE "rusEFI 2022.08.10.proteus_h7.1263797630" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index c8c1b5deb1..55c6aea251 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 1903325343 -#define TS_SIGNATURE "rusEFI 2022.08.10.subaru_eg33_f7.1903325343" +#define SIGNATURE_HASH 3850910650 +#define TS_SIGNATURE "rusEFI 2022.08.10.subaru_eg33_f7.3850910650" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index a47c0f50e4..7112e60fa6 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3496691577 -#define TS_SIGNATURE "rusEFI 2022.08.10.tdg-pdm8.3496691577" +#define SIGNATURE_HASH 1150356572 +#define TS_SIGNATURE "rusEFI 2022.08.10.tdg-pdm8.1150356572" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 35c4e53cda..33d1726378 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.all.2053343533" + signature = "rusEFI 2022.08.10.all.4003054088" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.all.2053343533" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.all.4003054088" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:44:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:28 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5049,6 +5053,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6092,6 +6099,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index faf4534eb4..50dc5f8367 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.48way.1833206114" + signature = "rusEFI 2022.08.10.48way.4190030407" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.48way.1833206114" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.48way.4190030407" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:09 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5046,6 +5050,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6087,6 +6094,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index b991ad356f..6a689e3ac0 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.alphax-2chan.1215370305" + signature = "rusEFI 2022.08.10.alphax-2chan.3700121444" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.alphax-2chan.1215370305" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.alphax-2chan.3700121444" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:39 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5043,6 +5047,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6073,6 +6080,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index c25c369e6a..8f5f97a213 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.alphax-4chan.1508861550" + signature = "rusEFI 2022.08.10.alphax-4chan.3440717131" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.alphax-4chan.1508861550" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.alphax-4chan.3440717131" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:40 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5044,6 +5048,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6074,6 +6081,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index b4281eb425..05c80dd02c 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.atlas.1722383370" + signature = "rusEFI 2022.08.10.atlas.4065539887" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.atlas.1722383370" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.atlas.4065539887" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:44:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:24 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5049,6 +5053,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6084,6 +6091,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index acef44c6dc..efcd0f86a8 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.core8.2358237396" + signature = "rusEFI 2022.08.10.core8.410358769" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.core8.2358237396" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.core8.410358769" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:07 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5046,6 +5050,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6087,6 +6094,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 5256bc764e..e1edb6d75b 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.f407-discovery.2053343533" + signature = "rusEFI 2022.08.10.f407-discovery.4003054088" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.f407-discovery.2053343533" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.f407-discovery.4003054088" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:44:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:21 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5049,6 +5053,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6092,6 +6099,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 2e1e11c1c3..2237da5fcb 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.f429-discovery.2053343533" + signature = "rusEFI 2022.08.10.f429-discovery.4003054088" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.f429-discovery.2053343533" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.f429-discovery.4003054088" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:44:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:23 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5049,6 +5053,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6092,6 +6099,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 0fbbe9ae45..717f6a834c 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.frankenso_na6.940537321" + signature = "rusEFI 2022.08.10.frankenso_na6.2901753548" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.frankenso_na6.940537321" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.frankenso_na6.2901753548" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:11 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5049,6 +5053,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6092,6 +6099,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 804340d216..5f5d39a6c9 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.harley81.244307538" + signature = "rusEFI 2022.08.10.harley81.2591399287" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.harley81.244307538" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.harley81.2591399287" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:42 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6073,6 +6080,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index a2e553e25b..05bc8e2893 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen-gm-e67.1533843528" + signature = "rusEFI 2022.08.10.hellen-gm-e67.3482768237" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen-gm-e67.1533843528" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen-gm-e67.3482768237" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:58 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6076,6 +6083,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 7bf8305bb5..f5ef9573b1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen-nb1.2749937889" + signature = "rusEFI 2022.08.10.hellen-nb1.923988932" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen-nb1.2749937889" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen-nb1.923988932" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:56 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6076,6 +6083,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index d8822a4832..9a0588ac0b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen121nissan.4072485319" + signature = "rusEFI 2022.08.10.hellen121nissan.1715960546" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen121nissan.4072485319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen121nissan.1715960546" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:48 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6073,6 +6080,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index fe4f20af10..04e3ece9c9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen121vag.172116567" + signature = "rusEFI 2022.08.10.hellen121vag.2662859122" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen121vag.172116567" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen121vag.2662859122" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:46 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6076,6 +6083,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 2894e9a9c4..02faa414e9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen128.2224927763" + signature = "rusEFI 2022.08.10.hellen128.275250998" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen128.2224927763" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen128.275250998" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:44 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6073,6 +6080,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 02960d395e..42c5a64cee 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen154hyundai.3794598825" + signature = "rusEFI 2022.08.10.hellen154hyundai.1993781388" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen154hyundai.3794598825" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen154hyundai.1993781388" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:49 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6073,6 +6080,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index ca4a7b7a28..af18e8a134 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen72.2287771689" + signature = "rusEFI 2022.08.10.hellen72.480701196" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen72.2287771689" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen72.480701196" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:53 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6076,6 +6083,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 3476bc7cb4..b0957df1bc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen81.1490440487" + signature = "rusEFI 2022.08.10.hellen81.3425442306" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen81.1490440487" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen81.3425442306" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:55 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5044,6 +5048,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6075,6 +6082,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 06c283c710..eaaf2be8a0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen88bmw.1872141025" + signature = "rusEFI 2022.08.10.hellen88bmw.4218212804" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen88bmw.1872141025" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen88bmw.4218212804" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:43:51 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6073,6 +6080,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 2fa2224b2d..e6925d23ff 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellenNA6.4175984717" + signature = "rusEFI 2022.08.10.hellenNA6.1813132136" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellenNA6.4175984717" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellenNA6.1813132136" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:00 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6076,6 +6083,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 5cc8e55068..d485092991 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellenNA8_96.2027574045" + signature = "rusEFI 2022.08.10.hellenNA8_96.3961526328" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellenNA8_96.2027574045" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellenNA8_96.3961526328" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:02 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6076,6 +6083,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index f8e33b1844..d79bf71a0f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.hellen_cypress.1062192935" + signature = "rusEFI 2022.08.10.hellen_cypress.2880801794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.hellen_cypress.1062192935" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.hellen_cypress.2880801794" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 10 00:44:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Aug 10 05:44:31 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5049,6 +5053,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6092,6 +6099,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index d275dc91de..b9a3da0728 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.kin.1628217514" + signature = "rusEFI 2022.08.10.kin.4126600079" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.kin.1628217514" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.kin.4126600079" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 10 00:44:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 10 05:44:29 UTC 2022 pageSize = 21272 page = 1 @@ -2071,7 +2071,7 @@ tcu_32Vals = array, U08, 21264, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2587,26 +2587,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4241,6 +4243,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5010,6 +5014,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6054,6 +6061,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 9daa308e4d..faee43c4e0 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.mre_f4.3048539611" + signature = "rusEFI 2022.08.10.mre_f4.558845694" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.mre_f4.3048539611" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.mre_f4.558845694" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:05 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5046,6 +5050,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6075,6 +6082,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 1784285371..82ee12feef 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.mre_f7.3048539611" + signature = "rusEFI 2022.08.10.mre_f7.558845694" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.mre_f7.3048539611" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.mre_f7.558845694" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:04 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5046,6 +5050,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6075,6 +6082,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 8633600002..f99248d561 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.prometheus_405.713642187" + signature = "rusEFI 2022.08.10.prometheus_405.3195214830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.prometheus_405.713642187" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.prometheus_405.3195214830" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:14 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5044,6 +5048,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6087,6 +6094,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index a8120cb740..7e2b7d5546 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.prometheus_469.713642187" + signature = "rusEFI 2022.08.10.prometheus_469.3195214830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.prometheus_469.713642187" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.prometheus_469.3195214830" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:12 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5044,6 +5048,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6087,6 +6094,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index aa7eb36928..e2539d9778 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.proteus_f4.3752742491" + signature = "rusEFI 2022.08.10.proteus_f4.1263797630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.proteus_f4.3752742491" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.proteus_f4.1263797630" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:18 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5042,6 +5046,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6067,6 +6074,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index f4017318cc..b52957be9c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.proteus_f7.3752742491" + signature = "rusEFI 2022.08.10.proteus_f7.1263797630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.proteus_f7.3752742491" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.proteus_f7.1263797630" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:43:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:16 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5042,6 +5046,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6067,6 +6074,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 3c017189ac..75cc3a5c5d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.proteus_h7.3752742491" + signature = "rusEFI 2022.08.10.proteus_h7.1263797630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.proteus_h7.3752742491" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.proteus_h7.1263797630" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:44:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:19 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5042,6 +5046,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6067,6 +6074,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 0b50892922..91f9729d6c 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.subaru_eg33_f7.1903325343" + signature = "rusEFI 2022.08.10.subaru_eg33_f7.3850910650" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.subaru_eg33_f7.1903325343" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.subaru_eg33_f7.3850910650" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Aug 10 00:44:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:32 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5045,6 +5049,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6086,6 +6093,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index eb484168b1..d6b2c62225 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.10.tdg-pdm8.3496691577" + signature = "rusEFI 2022.08.10.tdg-pdm8.1150356572" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.10.tdg-pdm8.3496691577" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.10.tdg-pdm8.1150356572" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:44:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:26 UTC 2022 pageSize = 21300 page = 1 @@ -2110,7 +2110,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1032 + ochBlockSize = 1040 ; ; see TunerStudioOutputChannels struct @@ -2626,26 +2626,28 @@ useInstantRpmForIdle = bits, U32, 968, [15:15] isVerboseIAC = bits, U32, 968, [16:16] targetRpmByClt = scalar, S32, 972, "", 1, 0 targetRpmAcBump = scalar, S32, 976, "", 1, 0 -; total TS size = 980 -baseDwell = scalar, F32, 980, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 984, "", 1, 0 -luaTimingAdd = scalar, F32, 988, "", 1, 0 -luaTimingMult = scalar, F32, 992, "", 1, 0 -; total TS size = 996 -idlePosition = scalar, F32, 996, "", 1, 0 -trim = scalar, F32, 1000, "", 1, 0 -luaAdjustment = scalar, F32, 1004, "", 1, 0 -etbFeedForward = scalar, F32, 1008, "", 1, 0 -etbIntegralError = scalar, F32, 1012, "", 1, 0 -etbCurrentTarget = scalar, F32, 1016, "%", 1, 0 -; total TS size = 1020 -faultCode = scalar, U08, 1020, "", 1, 0 -heaterDuty = scalar, U08, 1021, "%", 1, 0 -pumpDuty = scalar, U08, 1022, "%", 1, 0 -tempC = scalar, U16, 1024, "C", 1, 0 -nernstVoltage = scalar, U16, 1026, "V", 0.001, 0 -esr = scalar, U16, 1028, "", 1, 0 -; total TS size = 1032 +airTaperRpmRange = scalar, S32, 980, "", 1, 0 +airByRpmTaper = scalar, F32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +etbFeedForward = scalar, F32, 1016, "", 1, 0 +etbIntegralError = scalar, F32, 1020, "", 1, 0 +etbCurrentTarget = scalar, F32, 1024, "%", 1, 0 +; total TS size = 1028 +faultCode = scalar, U08, 1028, "", 1, 0 +heaterDuty = scalar, U08, 1029, "%", 1, 0 +pumpDuty = scalar, U08, 1030, "%", 1, 0 +tempC = scalar, U16, 1032, "C", 1, 0 +nernstVoltage = scalar, U16, 1034, "V", 0.001, 0 +esr = scalar, U16, 1036, "", 1, 0 +; total TS size = 1040 time = { timeNow } @@ -4280,6 +4282,8 @@ entry = useInstantRpmForIdle, "useInstantRpmForIdle", int, "%d" entry = isVerboseIAC, "isVerboseIAC", int, "%d" entry = targetRpmByClt, "idle: target by CLT", int, "%d" entry = targetRpmAcBump, "idle: A/C bump", int, "%d" +entry = airTaperRpmRange, "RPM range above upper limit for extra air taper", int, "%d" +entry = airByRpmTaper, "Extra air taper amount", float, "%.3f" entry = baseDwell, "baseDwell", float, "%.3f" entry = dwellVoltageCorrection, "dwellVoltageCorrection", float, "%.3f" entry = luaTimingAdd, "luaTimingAdd", float, "%.3f" @@ -5049,6 +5053,9 @@ dialog = idle_stateDialog, "idle_state" graphLine = throttlePedalUpState graphLine = targetRpmByClt graphLine = targetRpmAcBump + graphLine = airTaperRpmRange + liveGraph = idle_state_3_Graph, "Graph", South + graphLine = airByRpmTaper dialog = ignition_stateDialog, "ignition_state" @@ -6092,6 +6099,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Extra idle air if throttle pressed", iacByTpsTaper + field = "Air Taper Rpm Range", airTaperRpmRange + field = "Air By Rpm Taper", airByRpmTaper dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold 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 93b16fc324..6570dbec0e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 00:44:15 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 10 05:44:36 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1894,7 +1894,6 @@ public class Fields { public static final int servoOutputPins7_offset = 2086; public static final int servoOutputPins8_offset = 2088; public static final int showHumanReadableWarning_offset = 960; - public static final int SIGNATURE_HASH = 2053343533; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2384,10 +2383,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.08.10.all.2053343533"; + public static final String TS_SIGNATURE = "rusEFI 2022.08.10.all.4003054088"; 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 = 1032; + public static final int TS_TOTAL_OUTPUT_SIZE = 1040; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index e4815aca77..7711652d12 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators\idle_state.txt Thu Apr 14 20:48:22 EDT 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Aug 10 05:43:37 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -45,6 +45,8 @@ public class IdleState { public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 20, FieldType.BIT, 31); public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0); public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0); + public static final Field AIRTAPERRPMRANGE = Field.create("AIRTAPERRPMRANGE", 32, FieldType.INT).setScale(1.0); + public static final Field AIRBYRPMTAPER = Field.create("AIRBYRPMTAPER", 36, FieldType.FLOAT); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, @@ -85,5 +87,7 @@ public class IdleState { UNUSEDBIT_22_31, TARGETRPMBYCLT, TARGETRPMACBUMP, + AIRTAPERRPMRANGE, + AIRBYRPMTAPER, }; }