diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h index a82fc34d38..413b1598c2 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Oct 19 16:56:18 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:51 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2598,11 +2598,11 @@ struct engine_configuration_s { */ Gpio camInputsDebug[CAM_INPUTS_COUNT]; /** - * Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. + * Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. RPM * offset 1348 */ - int16_t acIdleRpmBump; + int16_t acIdleRpmTarget; /** * set warningPeriod X seconds @@ -5360,4 +5360,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23672); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Oct 19 16:56:18 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:51 UTC 2023 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 5d57ee55d6..26ec9f2898 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -812,7 +812,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2754284763 +#define SIGNATURE_HASH 2134431962 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1107,7 +1107,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.10.22.cypress.2754284763" +#define TS_SIGNATURE "rusEFI master.2023.10.22.cypress.2134431962" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index d257cb6a8e..12546711e4 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Oct 19 16:56:17 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:49 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2598,11 +2598,11 @@ struct engine_configuration_s { */ Gpio camInputsDebug[CAM_INPUTS_COUNT]; /** - * Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. + * Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. RPM * offset 1348 */ - int16_t acIdleRpmBump; + int16_t acIdleRpmTarget; /** * set warningPeriod X seconds @@ -5360,4 +5360,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22296); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Oct 19 16:56:17 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:49 UTC 2023 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 7d96a74589..9e39b3595c 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -812,7 +812,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3875195765 +#define SIGNATURE_HASH 1038688116 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1107,7 +1107,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.10.22.kin.3875195765" +#define TS_SIGNATURE "rusEFI master.2023.10.22.kin.1038688116" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 0fb16aa2cb..68a37c10ea 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Oct 19 16:56:19 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:52 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2598,11 +2598,11 @@ struct engine_configuration_s { */ Gpio camInputsDebug[CAM_INPUTS_COUNT]; /** - * Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. + * Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. RPM * offset 1348 */ - int16_t acIdleRpmBump; + int16_t acIdleRpmTarget; /** * set warningPeriod X seconds @@ -5360,4 +5360,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23672); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Oct 19 16:56:19 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:52 UTC 2023 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 9436627cf3..1ce3e96e55 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 @@ -1050,7 +1050,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2745617356 +#define SIGNATURE_HASH 2025136077 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1345,7 +1345,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.10.22.subaru_eg33_f7.2745617356" +#define TS_SIGNATURE "rusEFI master.2023.10.22.subaru_eg33_f7.2025136077" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 87434e8485..02bef7ea24 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -587,7 +587,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 49d5fc311f..ce77cf9404 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -358,7 +358,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index f380f8af10..5c93a660f5 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -728,7 +728,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 75d75d75f2..8a66505b9f 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -522,7 +522,7 @@ iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, Field throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, -1.0, -1.0, ""), idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("Idle: Target A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), +targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -1.0, -1.0, ""), luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -1.0, -1.0, ""), idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, 0.0, 10.0, "per"), diff --git a/firmware/controllers/actuators/idle_state_generated.h b/firmware/controllers/actuators/idle_state_generated.h index 9547613ace..a395caff89 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 config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Thu Sep 28 13:44:07 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Sun Oct 22 22:35:39 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -160,10 +160,10 @@ struct idle_state_s { */ int targetRpmByClt = (int)0; /** - * Idle: Target A/C bump + * Idle: Target A/C RPM * offset 36 */ - int targetRpmAcBump = (int)0; + int targetRpmAc = (int)0; /** * idle: iacByRpmTaper portion * offset 40 @@ -178,4 +178,4 @@ struct idle_state_s { static_assert(sizeof(idle_state_s) == 48); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Thu Sep 28 13:44:07 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Sun Oct 22 22:35:39 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 291234eaae..f342f82d35 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Oct 19 16:58:27 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:20 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2598,11 +2598,11 @@ struct engine_configuration_s { */ Gpio camInputsDebug[CAM_INPUTS_COUNT]; /** - * Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. + * Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. RPM * offset 1348 */ - int16_t acIdleRpmBump; + int16_t acIdleRpmTarget; /** * set warningPeriod X seconds @@ -5360,4 +5360,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 23672); // end -// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Thu Oct 19 16:58:27 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:20 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 29809d9ffd..de51dcf9c6 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1103,7 +1103,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 120823520 +#define SIGNATURE_HASH 3693103841 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1398,7 +1398,7 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.10.22.f407-discovery.120823520" +#define TS_SIGNATURE "rusEFI master.2023.10.22.f407-discovery.3693103841" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index efdab89468..ad517f82ea 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3773924449 -#define TS_SIGNATURE "rusEFI master.2023.10.22.48way.3773924449" +#define SIGNATURE_HASH 1004687456 +#define TS_SIGNATURE "rusEFI master.2023.10.22.48way.1004687456" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 70c01ab091..0821ef24f4 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3562977500 -#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-2chan.3562977500" +#define SIGNATURE_HASH 256732381 +#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-2chan.256732381" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 46fce185d3..256467675b 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1813809702 -#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-4chan.1813809702" +#define SIGNATURE_HASH 3071237671 +#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-4chan.3071237671" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 6e4024ef64..a8d4eb3c9d 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1813809702 -#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-4chan_f7.1813809702" +#define SIGNATURE_HASH 3071237671 +#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-4chan_f7.3071237671" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index c328d60b1f..510de00e1f 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2514014936 -#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-8chan-revA.2514014936" +#define SIGNATURE_HASH 1321928409 +#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-8chan-revA.1321928409" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 76a2412fc8..3394ca82fc 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2843177811 -#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-8chan.2843177811" +#define SIGNATURE_HASH 1919199058 +#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-8chan.1919199058" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 1e050f4a98..d24e2dfcc8 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2843177811 -#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-8chan_f7.2843177811" +#define SIGNATURE_HASH 1919199058 +#define TS_SIGNATURE "rusEFI master.2023.10.22.alphax-8chan_f7.1919199058" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 2c80e86d70..23ba969628 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3101817340 -#define TS_SIGNATURE "rusEFI master.2023.10.22.atlas.3101817340" +#define SIGNATURE_HASH 1676815869 +#define TS_SIGNATURE "rusEFI master.2023.10.22.atlas.1676815869" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index a25344bc92..4aa5481756 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2618032493 -#define TS_SIGNATURE "rusEFI master.2023.10.22.core8.2618032493" +#define SIGNATURE_HASH 1193268588 +#define TS_SIGNATURE "rusEFI master.2023.10.22.core8.1193268588" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index b1b43ac86f..93995d406e 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 2754284763 -#define TS_SIGNATURE "rusEFI master.2023.10.22.cypress.2754284763" +#define SIGNATURE_HASH 2134431962 +#define TS_SIGNATURE "rusEFI master.2023.10.22.cypress.2134431962" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index f1911d6215..1afab3e8ba 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 120823520 -#define TS_SIGNATURE "rusEFI master.2023.10.22.f407-discovery.120823520" +#define SIGNATURE_HASH 3693103841 +#define TS_SIGNATURE "rusEFI master.2023.10.22.f407-discovery.3693103841" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 7982e01723..bf304d6dea 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2754284763 -#define TS_SIGNATURE "rusEFI master.2023.10.22.f429-discovery.2754284763" +#define SIGNATURE_HASH 2134431962 +#define TS_SIGNATURE "rusEFI master.2023.10.22.f429-discovery.2134431962" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index e7aa052eb9..51376e600e 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2256137233 -#define TS_SIGNATURE "rusEFI master.2023.10.22.frankenso_na6.2256137233" +#define SIGNATURE_HASH 1567242256 +#define TS_SIGNATURE "rusEFI master.2023.10.22.frankenso_na6.1567242256" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 892e47ebfb..e663ce8226 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 664104178 -#define TS_SIGNATURE "rusEFI master.2023.10.22.harley81.664104178" +#define SIGNATURE_HASH 4236687603 +#define TS_SIGNATURE "rusEFI master.2023.10.22.harley81.4236687603" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 6ca8d4e5ca..c3b18a6e06 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 628693417 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen-112-17.628693417" +#define SIGNATURE_HASH 4268412328 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen-112-17.4268412328" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 089fed038d..ab2bc4da01 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 349813291 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen-gm-e67.349813291" +#define SIGNATURE_HASH 3486150186 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen-gm-e67.3486150186" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 75efbf762e..8967b094b3 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2110468856 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen-honda-k.2110468856" +#define SIGNATURE_HASH 2799232761 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen-honda-k.2799232761" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index d7eb0b1281..57aa87620b 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3421045196 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen-nb1.3421045196" +#define SIGNATURE_HASH 284874189 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen-nb1.284874189" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 3619b270c1..2c57687fa9 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1025370863 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen121nissan.1025370863" +#define SIGNATURE_HASH 3859693294 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen121nissan.3859693294" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 93d0d5ac75..0fd50bb077 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 810881816 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen121vag.810881816" +#define SIGNATURE_HASH 3947284249 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen121vag.3947284249" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index c037b13037..d41dc96bf1 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1811516337 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen128.1811516337" +#define SIGNATURE_HASH 2968149936 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen128.2968149936" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 485346491f..aabcfe5a84 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1969751649 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen154hyundai.1969751649" +#define SIGNATURE_HASH 2927350368 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen154hyundai.2927350368" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 7a3651dac1..9edbdf9a18 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3362720502 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen72.3362720502" +#define SIGNATURE_HASH 326950647 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen72.326950647" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 84a4b04897..9f2a1e8ed2 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2037972660 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen81.2037972660" +#define SIGNATURE_HASH 2724932277 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen81.2724932277" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 431d676c1a..1b46ac4982 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1242464543 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen88bmw.1242464543" +#define SIGNATURE_HASH 2434618654 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellen88bmw.2434618654" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 39b7bc26af..c48f541607 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1327927551 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellenNA6.1327927551" +#define SIGNATURE_HASH 2486519038 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellenNA6.2486519038" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index e3df159fda..7506554183 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 696746032 -#define TS_SIGNATURE "rusEFI master.2023.10.22.hellenNA8_96.696746032" +#define SIGNATURE_HASH 4069807153 +#define TS_SIGNATURE "rusEFI master.2023.10.22.hellenNA8_96.4069807153" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index d47ffc7271..9df8fb5fee 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 config_definition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 3875195765 -#define TS_SIGNATURE "rusEFI master.2023.10.22.kin.3875195765" +#define SIGNATURE_HASH 1038688116 +#define TS_SIGNATURE "rusEFI master.2023.10.22.kin.1038688116" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 9e5bc0161f..3954d6f906 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3188723925 -#define TS_SIGNATURE "rusEFI master.2023.10.22.m74_9.3188723925" +#define SIGNATURE_HASH 1694745812 +#define TS_SIGNATURE "rusEFI master.2023.10.22.m74_9.1694745812" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 7bc5e56860..51bdf3b47d 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2269570395 -#define TS_SIGNATURE "rusEFI master.2023.10.22.mre_f4.2269570395" +#define SIGNATURE_HASH 1549087066 +#define TS_SIGNATURE "rusEFI master.2023.10.22.mre_f4.1549087066" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 6a288322cf..16563df15b 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2269570395 -#define TS_SIGNATURE "rusEFI master.2023.10.22.mre_f7.2269570395" +#define SIGNATURE_HASH 1549087066 +#define TS_SIGNATURE "rusEFI master.2023.10.22.mre_f7.1549087066" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index 276cf89fbd..028f3c0b77 100644 --- a/firmware/controllers/generated/signature_nucleo_f429.h +++ b/firmware/controllers/generated/signature_nucleo_f429.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2754284763 -#define TS_SIGNATURE "rusEFI master.2023.10.22.nucleo_f429.2754284763" +#define SIGNATURE_HASH 2134431962 +#define TS_SIGNATURE "rusEFI master.2023.10.22.nucleo_f429.2134431962" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index c8be6f6baa..6a973a2492 100644 --- a/firmware/controllers/generated/signature_nucleo_f767.h +++ b/firmware/controllers/generated/signature_nucleo_f767.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2754284763 -#define TS_SIGNATURE "rusEFI master.2023.10.22.nucleo_f767.2754284763" +#define SIGNATURE_HASH 2134431962 +#define TS_SIGNATURE "rusEFI master.2023.10.22.nucleo_f767.2134431962" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 6187dec612..5dda4c3b33 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2754284763 -#define TS_SIGNATURE "rusEFI master.2023.10.22.nucleo_h743.2754284763" +#define SIGNATURE_HASH 2134431962 +#define TS_SIGNATURE "rusEFI master.2023.10.22.nucleo_h743.2134431962" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e1971901e9..e5bad4dd06 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2495594827 -#define TS_SIGNATURE "rusEFI master.2023.10.22.prometheus_405.2495594827" +#define SIGNATURE_HASH 1336677706 +#define TS_SIGNATURE "rusEFI master.2023.10.22.prometheus_405.1336677706" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 6a415b580d..63dc33d96a 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 config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2495594827 -#define TS_SIGNATURE "rusEFI master.2023.10.22.prometheus_469.2495594827" +#define SIGNATURE_HASH 1336677706 +#define TS_SIGNATURE "rusEFI master.2023.10.22.prometheus_469.1336677706" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5b4a5eae05..21ee1a43f9 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2755195553 -#define TS_SIGNATURE "rusEFI master.2023.10.22.proteus_f4.2755195553" +#define SIGNATURE_HASH 2133534368 +#define TS_SIGNATURE "rusEFI master.2023.10.22.proteus_f4.2133534368" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index c80e5c501c..2421974061 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2755195553 -#define TS_SIGNATURE "rusEFI master.2023.10.22.proteus_f7.2755195553" +#define SIGNATURE_HASH 2133534368 +#define TS_SIGNATURE "rusEFI master.2023.10.22.proteus_f7.2133534368" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index bf0af62dd8..1280d38a81 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2755195553 -#define TS_SIGNATURE "rusEFI master.2023.10.22.proteus_h7.2755195553" +#define SIGNATURE_HASH 2133534368 +#define TS_SIGNATURE "rusEFI master.2023.10.22.proteus_h7.2133534368" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 5ccefaf902..cc0e54be89 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3228625287 -#define TS_SIGNATURE "rusEFI master.2023.10.22.s105.3228625287" +#define SIGNATURE_HASH 459488646 +#define TS_SIGNATURE "rusEFI master.2023.10.22.s105.459488646" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index ff9ff1e933..5e7df91c29 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2433331214 -#define TS_SIGNATURE "rusEFI master.2023.10.22.small-can-board.2433331214" +#define SIGNATURE_HASH 1243243535 +#define TS_SIGNATURE "rusEFI master.2023.10.22.small-can-board.1243243535" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 3f9376b254..33acd72104 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2745617356 -#define TS_SIGNATURE "rusEFI master.2023.10.22.subaru_eg33_f7.2745617356" +#define SIGNATURE_HASH 2025136077 +#define TS_SIGNATURE "rusEFI master.2023.10.22.subaru_eg33_f7.2025136077" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 304d8ec5f4..ce2833ebac 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2754284763 -#define TS_SIGNATURE "rusEFI master.2023.10.22.t-b-g.2754284763" +#define SIGNATURE_HASH 2134431962 +#define TS_SIGNATURE "rusEFI master.2023.10.22.t-b-g.2134431962" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 2c3f0617f2..ebc5b9f306 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 780476665 -#define TS_SIGNATURE "rusEFI master.2023.10.22.tdg-pdm8.780476665" +#define SIGNATURE_HASH 4120311032 +#define TS_SIGNATURE "rusEFI master.2023.10.22.tdg-pdm8.4120311032" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 8329cbdb62..a65aa4c2fb 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -907,9 +907,9 @@ float getConfigValueByName(const char *name) { // turboSpeedSensorMultiplier case -1056007485: return engineConfiguration->turboSpeedSensorMultiplier; -// acIdleRpmBump - case 1683471850: - return engineConfiguration->acIdleRpmBump; +// acIdleRpmTarget + case 30701245: + return engineConfiguration->acIdleRpmTarget; // warningPeriod case 1322924702: return engineConfiguration->warningPeriod; @@ -3240,9 +3240,9 @@ bool setConfigValueByName(const char *name, float value) { engineConfiguration->turboSpeedSensorMultiplier = value; return 1; } - case 1683471850: + case 30701245: { - engineConfiguration->acIdleRpmBump = (int)value; + engineConfiguration->acIdleRpmTarget = (int)value; return 1; } case 1322924702: diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index 237536877a..9df2bf4feb 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -901,8 +901,8 @@ If increased VVT duty cycle increases the indicated VVT angle, set this to 'adva ### turboSpeedSensorMultiplier -### acIdleRpmBump -Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. +### acIdleRpmTarget +Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling. ### warningPeriod set warningPeriod X diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index e5f3c46de6..2701388e6a 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.f407-discovery.120823520" + signature = "rusEFI master.2023.10.22.f407-discovery.3693103841" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.f407-discovery.120823520" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.f407-discovery.3693103841" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:27 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:20 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6183,7 +6183,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7458,7 +7458,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7541,7 +7541,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 6ce29713ab..1c79017c0e 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.48way.3773924449" + signature = "rusEFI master.2023.10.22.48way.1004687456" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.48way.3773924449" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.48way.1004687456" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Battery Reference Input (A0)","TPS Reference Input (A1)","CLT Reference Input (A2)","IAT Reference Input (A3)","O2 Reference Input (A4)","INVALID","INVALID","INVALID","MAP Pressure Reference Input (B0)","BARO Pressure Reference Input (B1)","INVALID","INVALID","INVALID","INVALID","Fuel Pressure Reference Input (C4)","Oil Pressure Reference Input (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:35 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:19 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6183,7 +6183,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7457,7 +7457,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7540,7 +7540,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index c1b78e03af..b1abbdfdf9 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.alphax-2chan.3562977500" + signature = "rusEFI master.2023.10.22.alphax-2chan.256732381" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.alphax-2chan.3562977500" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.alphax-2chan.256732381" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","X7 - AIN4","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:56 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6179,7 +6179,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7429,7 +7429,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7512,7 +7512,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 6b85fee5fe..1ab4df7bfc 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.alphax-4chan.1813809702" + signature = "rusEFI master.2023.10.22.alphax-4chan.3071237671" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.alphax-4chan.1813809702" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.alphax-4chan.3071237671" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X5 - AIN4","INVALID","INVALID","INVALID","INVALID","D5 - PPS rev G" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:26 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:59 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7432,7 +7432,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7515,7 +7515,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 55f3910fa3..60003c0c87 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.alphax-4chan_f7.1813809702" + signature = "rusEFI master.2023.10.22.alphax-4chan_f7.3071237671" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.alphax-4chan_f7.1813809702" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.alphax-4chan_f7.3071237671" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X5 - AIN4","INVALID","INVALID","INVALID","INVALID","D5 - PPS rev G" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:29 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:03 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7432,7 +7432,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7515,7 +7515,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 3fd96e3ff7..263b588d38 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.alphax-8chan-revA.2514014936" + signature = "rusEFI master.2023.10.22.alphax-8chan-revA.1321928409" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.alphax-8chan-revA.2514014936" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.alphax-8chan-revA.1321928409" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:13 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6183,7 +6183,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7433,7 +7433,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7516,7 +7516,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 4157076bdf..6b19ab55a8 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.alphax-8chan.2843177811" + signature = "rusEFI master.2023.10.22.alphax-8chan.1919199058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.alphax-8chan.2843177811" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.alphax-8chan.1919199058" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","33A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","32A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:32 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:06 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6183,7 +6183,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7433,7 +7433,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7516,7 +7516,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 20139c88f5..1b978fec78 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.alphax-8chan_f7.2843177811" + signature = "rusEFI master.2023.10.22.alphax-8chan_f7.1919199058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.alphax-8chan_f7.2843177811" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.alphax-8chan_f7.1919199058" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","33A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","32A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:35 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:10 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6183,7 +6183,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7433,7 +7433,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7516,7 +7516,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e9698ca62f..c9c2625f38 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.atlas.3101817340" + signature = "rusEFI master.2023.10.22.atlas.1676815869" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.atlas.3101817340" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.atlas.1676815869" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:16 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:07 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7447,7 +7447,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7530,7 +7530,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index c704b3df96..b13f831b73 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.core8.2618032493" + signature = "rusEFI master.2023.10.22.core8.1193268588" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.core8.2618032493" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.core8.1193268588" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","On-board Battery Sense (A0)","Analog Inputs 1 (A1)","Analog Inputs 2 (A2)","Analog Inputs 3 (A3)","Analog Inputs 4 (A4)","On-board MAP (A5)","Analog Inputs 6 (A6)","Analog Inputs 7 (A7)","On-board BARO (B0)","Analog Inputs 9 (B1)","Analog Inputs 10 (C0)","Primary On-board O2 (C1)","Secondary On-board O2 (C2)","Analog Inputs 13 (C3)","Analog Inputs 14 (C4)","Analog Inputs 15 (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:32 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:16 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6183,7 +6183,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7457,7 +7457,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7540,7 +7540,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index f6312fcb24..319b3fc4f5 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.cypress.2754284763" + signature = "rusEFI master.2023.10.22.cypress.2134431962" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.cypress.2754284763" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.cypress.2134431962" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:19 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:51 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 7c3d1c2802..8f3fa124d9 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.f407-discovery.120823520" + signature = "rusEFI master.2023.10.22.f407-discovery.3693103841" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.f407-discovery.120823520" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.f407-discovery.3693103841" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:22 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:14 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6183,7 +6183,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7458,7 +7458,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7541,7 +7541,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 4f7bee61be..672b7d3424 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.f429-discovery.2754284763" + signature = "rusEFI master.2023.10.22.f429-discovery.2134431962" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.f429-discovery.2754284763" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.f429-discovery.2134431962" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:04 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:54 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 2b5c94bf26..5fe3978205 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.frankenso_na6.2256137233" + signature = "rusEFI master.2023.10.22.frankenso_na6.1567242256" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.frankenso_na6.2256137233" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.frankenso_na6.1567242256" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:47 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:34 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 164b4959ea..102812433d 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.harley81.664104178" + signature = "rusEFI master.2023.10.22.harley81.4236687603" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.harley81.664104178" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.harley81.4236687603" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","27 - TPS 2","INVALID","41 - PPS 1","52 - TPS 1","5 Battery Sense","INVALID","INVALID","42 - PPS 2","INVALID","53 - MAP","55 Engine Temperature","49 CLT","72 IAT","32 Oil Pressure","34 Kickstand Position Sensor" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:17 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7445,7 +7445,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7528,7 +7528,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index bbe106664f..89da6c9b1a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen-112-17.628693417" + signature = "rusEFI master.2023.10.22.hellen-112-17.4268412328" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen-112-17.628693417" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen-112-17.4268412328" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","220 TPS Throttle Position 2","114 Analog Input","INVALID","121 PPS1","203 TPS Throttle Position 1","INVALID","107 TODO","119 Analog Input","110 Analog Input","INVALID","219 MAP","109 Analog Input","215 CLT","227 IAT","111 Analog Input","112 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:41 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6180,7 +6180,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7430,7 +7430,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7513,7 +7513,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 8803ec587c..e3811cfd6a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen-gm-e67.349813291" + signature = "rusEFI master.2023.10.22.hellen-gm-e67.3486150186" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen-gm-e67.349813291" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen-gm-e67.3486150186" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:15 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:55 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7446,7 +7446,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7529,7 +7529,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index e74edd0ebb..c7aba85987 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen-honda-k.2110468856" + signature = "rusEFI master.2023.10.22.hellen-honda-k.2799232761" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen-honda-k.2110468856" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen-honda-k.2799232761" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","INVALID","INVALID","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:54 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:31 UTC 2023 pageSize = 24344 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 24334, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6180,7 +6180,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7429,7 +7429,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7512,7 +7512,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 43a8b1ae4a..3b28ae9d4d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen-nb1.3421045196" + signature = "rusEFI master.2023.10.22.hellen-nb1.284874189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen-nb1.3421045196" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen-nb1.284874189" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:12 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:52 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7446,7 +7446,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7529,7 +7529,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index c09585f3ff..45f6330fbc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen121nissan.1025370863" + signature = "rusEFI master.2023.10.22.hellen121nissan.3859693294" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen121nissan.1025370863" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen121nissan.3859693294" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:27 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6180,7 +6180,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7429,7 +7429,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7512,7 +7512,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index ff0050b65a..d652a3d9e4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen121vag.810881816" + signature = "rusEFI master.2023.10.22.hellen121vag.3947284249" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen121vag.810881816" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen121vag.3947284249" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:47 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:24 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7446,7 +7446,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7529,7 +7529,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 86451888fb..339f8e9890 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen128.1811516337" + signature = "rusEFI master.2023.10.22.hellen128.2968149936" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen128.1811516337" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen128.2968149936" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:44 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:20 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7445,7 +7445,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7528,7 +7528,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index c3cec48496..02a61ff012 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen154hyundai.1969751649" + signature = "rusEFI master.2023.10.22.hellen154hyundai.2927350368" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen154hyundai.1969751649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen154hyundai.2927350368" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:57 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:34 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6180,7 +6180,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7429,7 +7429,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7512,7 +7512,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 2a76e980bf..6ee7fb7bc4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen72.3362720502" + signature = "rusEFI master.2023.10.22.hellen72.326950647" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen72.3362720502" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen72.326950647" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:06 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:45 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7446,7 +7446,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7529,7 +7529,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 86c8050197..4e0f65ee21 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen81.2037972660" + signature = "rusEFI master.2023.10.22.hellen81.2724932277" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen81.2037972660" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen81.2724932277" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:09 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:48 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6180,7 +6180,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7444,7 +7444,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7527,7 +7527,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index b8a96e6a11..c635e9bb64 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellen88bmw.1242464543" + signature = "rusEFI master.2023.10.22.hellen88bmw.2434618654" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellen88bmw.1242464543" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellen88bmw.2434618654" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:38 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7445,7 +7445,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7528,7 +7528,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index a65fdd9130..3ee40a1d12 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellenNA6.1327927551" + signature = "rusEFI master.2023.10.22.hellenNA6.2486519038" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellenNA6.1327927551" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellenNA6.2486519038" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:36:59 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7446,7 +7446,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7529,7 +7529,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 4073886e05..a2aa824e90 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.hellenNA8_96.696746032" + signature = "rusEFI master.2023.10.22.hellenNA8_96.4069807153" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.hellenNA8_96.696746032" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.hellenNA8_96.4069807153" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:21 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:02 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7446,7 +7446,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7529,7 +7529,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 634a09a3ed..d2df3f3c4e 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.kin.3875195765" + signature = "rusEFI master.2023.10.22.kin.1038688116" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.kin.3875195765" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.kin.1038688116" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:49 UTC 2023 pageSize = 22296 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22286, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7456,7 +7456,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7539,7 +7539,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 26271870ce..fb844091cf 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.m74_9.3188723925" + signature = "rusEFI master.2023.10.22.m74_9.1694745812" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.m74_9.3188723925" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.m74_9.1694745812" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:23 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7446,7 +7446,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7529,7 +7529,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index b3b483887b..b7a45e9968 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.mre_f4.2269570395" + signature = "rusEFI master.2023.10.22.mre_f4.1549087066" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.mre_f4.2269570395" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.mre_f4.1549087066" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:29 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:13 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5259,7 +5259,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6184,7 +6184,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7447,7 +7447,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7530,7 +7530,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 3af44d4e6c..84d5200c22 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.mre_f7.2269570395" + signature = "rusEFI master.2023.10.22.mre_f7.1549087066" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.mre_f7.2269570395" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.mre_f7.1549087066" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:26 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:09 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5259,7 +5259,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6184,7 +6184,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7447,7 +7447,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7530,7 +7530,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index 6ed2144959..5e61fd350a 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.nucleo_f429.2754284763" + signature = "rusEFI master.2023.10.22.nucleo_f429.2134431962" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.nucleo_f429.2754284763" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.nucleo_f429.2134431962" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:57 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index 7ab1507dd8..10adac5f09 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.nucleo_f767.2754284763" + signature = "rusEFI master.2023.10.22.nucleo_f767.2134431962" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.nucleo_f767.2754284763" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.nucleo_f767.2134431962" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:10 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:01 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index 9d64ecdb57..c4c07aec88 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.nucleo_h743.2754284763" + signature = "rusEFI master.2023.10.22.nucleo_h743.2134431962" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.nucleo_h743.2754284763" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.nucleo_h743.2134431962" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:13 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:04 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 8ee5f0cc26..60b34ad58d 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.prometheus_405.2495594827" + signature = "rusEFI master.2023.10.22.prometheus_405.1336677706" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.prometheus_405.2495594827" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.prometheus_405.1336677706" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:41 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6176,7 +6176,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7450,7 +7450,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7533,7 +7533,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 9a58f26912..09637f2b5f 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.prometheus_469.2495594827" + signature = "rusEFI master.2023.10.22.prometheus_469.1336677706" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.prometheus_469.2495594827" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.prometheus_469.1336677706" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:50 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:37 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6176,7 +6176,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7450,7 +7450,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7533,7 +7533,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index dad86c2952..c146cf6097 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.proteus_f4.2755195553" + signature = "rusEFI master.2023.10.22.proteus_f4.2133534368" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.proteus_f4.2755195553" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.proteus_f4.2133534368" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:58 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:47 UTC 2023 pageSize = 27672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6191,7 +6191,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7449,7 +7449,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7532,7 +7532,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index e76d39dba3..1137515044 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.proteus_f7.2755195553" + signature = "rusEFI master.2023.10.22.proteus_f7.2133534368" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.proteus_f7.2755195553" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.proteus_f7.2133534368" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:44 UTC 2023 pageSize = 27672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6191,7 +6191,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7449,7 +7449,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7532,7 +7532,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 16fb24a575..93a98155aa 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.proteus_h7.2755195553" + signature = "rusEFI master.2023.10.22.proteus_h7.2133534368" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.proteus_h7.2755195553" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.proteus_h7.2133534368" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:01 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:51 UTC 2023 pageSize = 27672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6191,7 +6191,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7449,7 +7449,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7532,7 +7532,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 0ab08aa09d..d258fbe615 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.s105.3228625287" + signature = "rusEFI master.2023.10.22.s105.459488646" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.s105.3228625287" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.s105.459488646" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:26 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6182,7 +6182,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7446,7 +7446,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7529,7 +7529,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index e2a037ff04..26e74046f8 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.small-can-board.2433331214" + signature = "rusEFI master.2023.10.22.small-can-board.1243243535" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.small-can-board.2433331214" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.small-can-board.1243243535" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input","C4 - Analog/Digital Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:06 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7447,7 +7447,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7530,7 +7530,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index e4f5c7229d..2fefbdcb67 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.subaru_eg33_f7.2745617356" + signature = "rusEFI master.2023.10.22.subaru_eg33_f7.2025136077" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.subaru_eg33_f7.2745617356" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.subaru_eg33_f7.2025136077" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:58:20 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:35:52 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 3adfc29ae8..511429c263 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.t-b-g.2754284763" + signature = "rusEFI master.2023.10.22.t-b-g.2134431962" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.t-b-g.2754284763" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.t-b-g.2134431962" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 20:59:44 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:37:30 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 2b7c9fb15f..7ef8ee9393 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.10.22.tdg-pdm8.780476665" + signature = "rusEFI master.2023.10.22.tdg-pdm8.4120311032" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.10.22.tdg-pdm8.780476665" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.10.22.tdg-pdm8.4120311032" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:19 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:11 UTC 2023 pageSize = 23672 page = 1 @@ -659,7 +659,7 @@ camInputsDebug1 = bits, U16, 1340, [0:7], $gpio_list camInputsDebug2 = bits, U16, 1342, [0:7], $gpio_list camInputsDebug3 = bits, U16, 1344, [0:7], $gpio_list camInputsDebug4 = bits, U16, 1346, [0:7], $gpio_list -acIdleRpmBump = scalar, S16, 1348, "RPM", 1, 0, 0, 1000, 0 +acIdleRpmTarget = scalar, S16, 1348, "RPM", 1, 0, 0, 2000, 0 warningPeriod = scalar, S16, 1350, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1352, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1356, "angle", 1, 0, -1000, 1000, 2 @@ -1852,7 +1852,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23662, [4], "RPM", 1, 0, 0, 18000, 0 camInputsDebug2 = "camInputsDebug 2" camInputsDebug3 = "camInputsDebug 3" camInputsDebug4 = "camInputsDebug 4" - acIdleRpmBump = "Extra idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." + acIdleRpmTarget = "Idle target speed when A/C is enabled. Some cars need the extra speed to keep the AC efficient while idling." warningPeriod = "set warningPeriod X" noAccelAfterHardLimitPeriodSecs = "TODO: finish this #413" mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." @@ -3077,7 +3077,7 @@ isIdleCoasting = bits, U32, 1320, [15:15] isIdleClosedLoop = bits, U32, 1320, [16:16] idleTarget = scalar, S32, 1324, "", 1, 0 targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAcBump = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1332, "", 1, 0 iacByRpmTaper = scalar, F32, 1336 luaAdd = scalar, F32, 1340 ; total TS size = 1344 @@ -5258,7 +5258,7 @@ entry = isIdleCoasting, "Idle: coasting", int, "%d" entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" entry = idleTarget, "Idle: Target RPM", int, "%d" entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" +entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" entry = idlePosition, "ETB: idlePosition", float, "%.3f" @@ -6181,7 +6181,7 @@ dialog = idle_stateDialog, "idle_state" graphLine = idleTarget graphLine = targetRpmByClt liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump + graphLine = targetRpmAc graphLine = iacByRpmTaper graphLine = luaAdd @@ -7455,7 +7455,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = idleOpenLoop, "Open Loop Idle" slider = "Open loop base position", manIdlePosition, horizontal field = "A/C adder", acIdleExtraOffset - field = "A/C target adder", acIdleRpmBump + field = "A/C RPM target", acIdleRpmTarget field = "Fan #1 adder", fan1ExtraIdle field = "Fan #2 adder", fan2ExtraIdle field = "Dashpot/Taper Initial IAC Adder", iacByTpsTaper @@ -7538,7 +7538,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Max CLT", maxAcClt field = "Max TPS", maxAcTps field = "A/C Idle adder", acIdleExtraOffset - field = "A/C RPM adder", acIdleRpmBump + field = "A/C Idle RPM", acIdleRpmTarget dialog = acSettings, "", border panel = acSettingsWest, West 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 9b638c6f8d..b791830e5d 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 config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 21:00:27 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Sun Oct 22 22:38:20 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1043,7 +1043,6 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; - public static final int SIGNATURE_HASH = 120823520; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; @@ -1269,7 +1268,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2023.10.22.f407-discovery.120823520"; + public static final String TS_SIGNATURE = "rusEFI master.2023.10.22.f407-discovery.3693103841"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; @@ -1953,7 +1952,7 @@ public class Fields { public static final Field CAMINPUTSDEBUG2 = Field.create("CAMINPUTSDEBUG2", 1342, FieldType.INT16, Gpio).setScale(1.0).setBaseOffset(0); public static final Field CAMINPUTSDEBUG3 = Field.create("CAMINPUTSDEBUG3", 1344, FieldType.INT16, Gpio).setScale(1.0).setBaseOffset(0); public static final Field CAMINPUTSDEBUG4 = Field.create("CAMINPUTSDEBUG4", 1346, FieldType.INT16, Gpio).setScale(1.0).setBaseOffset(0); - public static final Field ACIDLERPMBUMP = Field.create("ACIDLERPMBUMP", 1348, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field ACIDLERPMTARGET = Field.create("ACIDLERPMTARGET", 1348, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field WARNINGPERIOD = Field.create("WARNINGPERIOD", 1350, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field KNOCKDETECTIONWINDOWSTART = Field.create("KNOCKDETECTIONWINDOWSTART", 1352, FieldType.FLOAT).setBaseOffset(0); public static final Field KNOCKDETECTIONWINDOWEND = Field.create("KNOCKDETECTIONWINDOWEND", 1356, FieldType.FLOAT).setBaseOffset(0); @@ -3521,7 +3520,7 @@ public class Fields { CAMINPUTSDEBUG2, CAMINPUTSDEBUG3, CAMINPUTSDEBUG4, - ACIDLERPMBUMP, + ACIDLERPMTARGET, WARNINGPERIOD, KNOCKDETECTIONWINDOWSTART, KNOCKDETECTIONWINDOWEND, 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 68be735683..6c0244c9de 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 config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Thu Oct 19 16:56:08 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Sun Oct 22 22:35:39 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -194,7 +194,7 @@ public class IdleState { public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1296); public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1296); public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 36, FieldType.INT).setScale(1.0).setBaseOffset(1296); + public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1296); public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1296); public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1296); public static final Field[] VALUES = { @@ -223,7 +223,7 @@ public class IdleState { ISIDLECLOSEDLOOP, IDLETARGET, TARGETRPMBYCLT, - TARGETRPMACBUMP, + TARGETRPMAC, IACBYRPMTAPER, LUAADD, };