From 766735f3b6352c80f43b66696c24a69b82219e08 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Thu, 8 Sep 2022 02:51:42 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 7 +++-- .../controllers/algo/rusefi_generated.h | 6 ++--- ...ngine_configuration_generated_structures.h | 7 +++-- .../controllers/algo/rusefi_generated.h | 6 ++--- ...ngine_configuration_generated_structures.h | 7 +++-- .../controllers/algo/rusefi_generated.h | 6 ++--- .../console/binary/generated/data_logs.ini | 1 - firmware/console/binary/generated/gauges.ini | 2 +- .../binary/generated/output_channels.ini | 2 +- .../binary/output_channels_generated.h | 6 ++--- ...ngine_configuration_generated_structures.h | 7 +++-- .../controllers/generated/rusefi_generated.h | 6 ++--- .../controllers/generated/signature_48way.h | 4 +-- .../controllers/generated/signature_all.h | 4 +-- .../generated/signature_alphax-2chan.h | 4 +-- .../generated/signature_alphax-4chan.h | 4 +-- .../controllers/generated/signature_atlas.h | 4 +-- .../controllers/generated/signature_core8.h | 4 +-- .../controllers/generated/signature_cypress.h | 4 +-- .../generated/signature_f407-discovery.h | 4 +-- .../generated/signature_f429-discovery.h | 4 +-- .../generated/signature_frankenso_na6.h | 4 +-- .../generated/signature_harley81.h | 4 +-- .../generated/signature_hellen-gm-e67.h | 4 +-- .../generated/signature_hellen-nb1.h | 4 +-- .../generated/signature_hellen121nissan.h | 4 +-- .../generated/signature_hellen121vag.h | 4 +-- .../generated/signature_hellen128.h | 4 +-- .../generated/signature_hellen154hyundai.h | 4 +-- .../generated/signature_hellen72.h | 4 +-- .../generated/signature_hellen81.h | 4 +-- .../generated/signature_hellen88bmw.h | 4 +-- .../generated/signature_hellenNA6.h | 4 +-- .../generated/signature_hellenNA8_96.h | 4 +-- .../controllers/generated/signature_kin.h | 4 +-- .../controllers/generated/signature_mre_f4.h | 4 +-- .../controllers/generated/signature_mre_f7.h | 4 +-- .../generated/signature_prometheus_405.h | 4 +-- .../generated/signature_prometheus_469.h | 4 +-- .../generated/signature_proteus_f4.h | 4 +-- .../generated/signature_proteus_f7.h | 4 +-- .../generated/signature_proteus_h7.h | 4 +-- .../generated/signature_subaru_eg33_f7.h | 4 +-- .../generated/signature_tdg-pdm8.h | 4 +-- .../lua/generated/output_lookup_generated.cpp | 2 -- .../lua/generated/value_lookup_generated.cpp | 7 ----- firmware/tunerstudio/generated/rusefi.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_48way.ini | 27 +++++++++---------- .../generated/rusefi_alphax-2chan.ini | 27 +++++++++---------- .../generated/rusefi_alphax-4chan.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_core8.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_cypress.ini | 27 +++++++++---------- .../generated/rusefi_f407-discovery.ini | 27 +++++++++---------- .../generated/rusefi_f429-discovery.ini | 27 +++++++++---------- .../generated/rusefi_frankenso_na6.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_harley81.ini | 27 +++++++++---------- .../generated/rusefi_hellen-gm-e67.ini | 27 +++++++++---------- .../generated/rusefi_hellen-nb1.ini | 27 +++++++++---------- .../generated/rusefi_hellen121nissan.ini | 27 +++++++++---------- .../generated/rusefi_hellen121vag.ini | 27 +++++++++---------- .../generated/rusefi_hellen128mercedes.ini | 27 +++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_hellen81.ini | 27 +++++++++---------- .../generated/rusefi_hellen88bmw.ini | 27 +++++++++---------- .../generated/rusefi_hellenNA6.ini | 27 +++++++++---------- .../generated/rusefi_hellenNA8_96.ini | 27 +++++++++---------- firmware/tunerstudio/generated/rusefi_kin.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 27 +++++++++---------- .../generated/rusefi_prometheus_405.ini | 27 +++++++++---------- .../generated/rusefi_prometheus_469.ini | 27 +++++++++---------- .../generated/rusefi_proteus_f4.ini | 27 +++++++++---------- .../generated/rusefi_proteus_f7.ini | 27 +++++++++---------- .../generated/rusefi_proteus_h7.ini | 27 +++++++++---------- .../generated/rusefi_subaru_eg33_f7.ini | 27 +++++++++---------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 27 +++++++++---------- .../com/rusefi/config/generated/Fields.java | 11 ++++---- .../rusefi/config/generated/TsOutputs.java | 6 ++--- 80 files changed, 485 insertions(+), 596 deletions(-) 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 5681a86b7c..c97a3db5ec 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 ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Sep 06 20:36:55 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 08 02:50:41 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1692,9 +1692,8 @@ struct engine_configuration_s { offset 764 bit 14 */ bool enableVerboseCanTx : 1 {}; /** - * This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control. offset 764 bit 15 */ - bool onOffAlternatorLogic : 1 {}; + bool unusedAlteOnOff : 1 {}; /** * enable cj125/disable cj125 offset 764 bit 16 */ @@ -4988,4 +4987,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Sep 06 20:36:55 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 08 02:50:41 UTC 2022 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 22b1fd714d..4f590fc6f6 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1746,7 +1746,6 @@ #define oilPressure_v2_offset 2052 #define oilPressure_value1_offset 2048 #define oilPressure_value2_offset 2056 -#define onOffAlternatorLogic_offset 764 #define operation_mode_e_FOUR_STROKE_CAM_SENSOR 2 #define operation_mode_e_FOUR_STROKE_CRANK_SENSOR 1 #define operation_mode_e_FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR 4 @@ -1929,7 +1928,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 387675106 +#define SIGNATURE_HASH 2785459037 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2496,7 +2495,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.08.cypress.387675106" +#define TS_SIGNATURE "rusEFI 2022.09.08.cypress.2785459037" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2546,6 +2545,7 @@ #define unused_1484_bit_30_offset 1372 #define unused_1484_bit_31_offset 1372 #define unused_1484_bit_38_offset 1372 +#define unusedAlteOnOff_offset 764 #define unusedBit_45_31_offset 120 #define unusedBit_539_10_offset 1628 #define unusedBit_539_11_offset 1628 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 99deaf4158..6f99429448 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 ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Sep 06 20:36:53 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 08 02:50:40 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1692,9 +1692,8 @@ struct engine_configuration_s { offset 764 bit 14 */ bool enableVerboseCanTx : 1 {}; /** - * This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control. offset 764 bit 15 */ - bool onOffAlternatorLogic : 1 {}; + bool unusedAlteOnOff : 1 {}; /** * enable cj125/disable cj125 offset 764 bit 16 */ @@ -4988,4 +4987,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Sep 06 20:36:53 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 08 02:50:40 UTC 2022 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 3f3b586159..7564aaf4c9 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1746,7 +1746,6 @@ #define oilPressure_v2_offset 2052 #define oilPressure_value1_offset 2048 #define oilPressure_value2_offset 2056 -#define onOffAlternatorLogic_offset 764 #define operation_mode_e_FOUR_STROKE_CAM_SENSOR 2 #define operation_mode_e_FOUR_STROKE_CRANK_SENSOR 1 #define operation_mode_e_FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR 4 @@ -1929,7 +1928,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2144129326 +#define SIGNATURE_HASH 3469810065 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2496,7 +2495,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.08.kin.2144129326" +#define TS_SIGNATURE "rusEFI 2022.09.08.kin.3469810065" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2546,6 +2545,7 @@ #define unused_1484_bit_30_offset 1372 #define unused_1484_bit_31_offset 1372 #define unused_1484_bit_38_offset 1372 +#define unusedAlteOnOff_offset 764 #define unusedBit_45_31_offset 120 #define unusedBit_539_10_offset 1628 #define unusedBit_539_11_offset 1628 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 a3b08690bb..5ba6f24489 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 ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Tue Sep 06 20:36:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:43 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1692,9 +1692,8 @@ struct engine_configuration_s { offset 764 bit 14 */ bool enableVerboseCanTx : 1 {}; /** - * This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control. offset 764 bit 15 */ - bool onOffAlternatorLogic : 1 {}; + bool unusedAlteOnOff : 1 {}; /** * enable cj125/disable cj125 offset 764 bit 16 */ @@ -4988,4 +4987,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Tue Sep 06 20:36:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:43 UTC 2022 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 e157f709a2..896a073ef8 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 @@ -1710,7 +1710,6 @@ #define oilPressure_v2_offset 2052 #define oilPressure_value1_offset 2048 #define oilPressure_value2_offset 2056 -#define onOffAlternatorLogic_offset 764 #define operation_mode_e_FOUR_STROKE_CAM_SENSOR 2 #define operation_mode_e_FOUR_STROKE_CRANK_SENSOR 1 #define operation_mode_e_FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR 4 @@ -1895,7 +1894,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 1845865016 +#define SIGNATURE_HASH 3742917255 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2463,7 +2462,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.08.subaru_eg33_f7.1845865016" +#define TS_SIGNATURE "rusEFI 2022.09.08.subaru_eg33_f7.3742917255" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2513,6 +2512,7 @@ #define unused_1484_bit_30_offset 1372 #define unused_1484_bit_31_offset 1372 #define unused_1484_bit_38_offset 1372 +#define unusedAlteOnOff_offset 764 #define unusedBit_45_31_offset 120 #define unusedBit_539_10_offset 1628 #define unusedBit_539_11_offset 1628 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 70d5b88869..a09e26fc70 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -8,7 +8,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 77683736dd..9cc933c377 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -10,7 +10,7 @@ checkEngineGauge = checkEngine,"checkEngine", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1. needBurnGauge = needBurn,"needBurn", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 sd_msdGauge = sd_msd,"sd_msd", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isFan2OnGauge = isFan2On,"isFan2On", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -alternatorOnOffGauge = alternatorOnOff,"alternatorOnOff", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBitLAtwfsGauge = unusedBitLAtwfs,"unusedBitLAtwfs", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 toothLogReadyGauge = toothLogReady,"toothLogReady", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 unused3123Gauge = unused3123,"unused3123", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isTpsErrorGauge = isTpsError,"isTpsError", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 4556fbbf4b..8d83efec93 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -10,7 +10,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index 7df61f2a26..2de0b7dea8 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Sep 05 05:32:10 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 08 02:50:38 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -73,7 +73,7 @@ struct output_channels_s { bool isFan2On : 1 {}; /** offset 0 bit 12 */ - bool alternatorOnOff : 1 {}; + bool unusedBitLAtwfs : 1 {}; /** offset 0 bit 13 */ bool toothLogReady : 1 {}; @@ -1393,4 +1393,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 744); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Sep 05 05:32:10 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 08 02:50:38 UTC 2022 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index fb5b864a58..619984cdab 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 06 20:37:55 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:33 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1692,9 +1692,8 @@ struct engine_configuration_s { offset 764 bit 14 */ bool enableVerboseCanTx : 1 {}; /** - * This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control. offset 764 bit 15 */ - bool onOffAlternatorLogic : 1 {}; + bool unusedAlteOnOff : 1 {}; /** * enable cj125/disable cj125 offset 764 bit 16 */ @@ -4988,4 +4987,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21300); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 06 20:37:55 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:33 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 753e6fdf63..46854de0ee 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1746,7 +1746,6 @@ #define oilPressure_v2_offset 2052 #define oilPressure_value1_offset 2048 #define oilPressure_value2_offset 2056 -#define onOffAlternatorLogic_offset 764 #define operation_mode_e_FOUR_STROKE_CAM_SENSOR 2 #define operation_mode_e_FOUR_STROKE_CRANK_SENSOR 1 #define operation_mode_e_FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR 4 @@ -1929,7 +1928,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 387675106 +#define SIGNATURE_HASH 2785459037 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2496,7 +2495,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.08.all.387675106" +#define TS_SIGNATURE "rusEFI 2022.09.08.all.2785459037" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2546,6 +2545,7 @@ #define unused_1484_bit_30_offset 1372 #define unused_1484_bit_31_offset 1372 #define unused_1484_bit_38_offset 1372 +#define unusedAlteOnOff_offset 764 #define unusedBit_45_31_offset 120 #define unusedBit_539_10_offset 1628 #define unusedBit_539_11_offset 1628 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 5392f7cef7..9b908611c1 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3963821 -#define TS_SIGNATURE "rusEFI 2022.09.08.48way.3963821" +#define SIGNATURE_HASH 2971775762 +#define TS_SIGNATURE "rusEFI 2022.09.08.48way.2971775762" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 92024105ff..5fc5276bbb 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 387675106 -#define TS_SIGNATURE "rusEFI 2022.09.08.all.387675106" +#define SIGNATURE_HASH 2785459037 +#define TS_SIGNATURE "rusEFI 2022.09.08.all.2785459037" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 13fb3fa1c0..6316779116 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 621407886 -#define TS_SIGNATURE "rusEFI 2022.09.08.alphax-2chan.621407886" +#define SIGNATURE_HASH 2484348465 +#define TS_SIGNATURE "rusEFI 2022.09.08.alphax-2chan.2484348465" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 9ab40568a4..0c623183a8 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2617749613 -#define TS_SIGNATURE "rusEFI 2022.09.08.alphax-4chan.2617749613" +#define SIGNATURE_HASH 756709586 +#define TS_SIGNATURE "rusEFI 2022.09.08.alphax-4chan.756709586" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index bfd30671af..bebf64caae 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 198280901 -#define TS_SIGNATURE "rusEFI 2022.09.08.atlas.198280901" +#define SIGNATURE_HASH 3133951610 +#define TS_SIGNATURE "rusEFI 2022.09.08.atlas.3133951610" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index b0e5b5a66e..49808cccf9 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3791069723 -#define TS_SIGNATURE "rusEFI 2022.09.08.core8.3791069723" +#define SIGNATURE_HASH 1357572772 +#define TS_SIGNATURE "rusEFI 2022.09.08.core8.1357572772" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 4b8aea6654..b627bc15cb 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 387675106 -#define TS_SIGNATURE "rusEFI 2022.09.08.cypress.387675106" +#define SIGNATURE_HASH 2785459037 +#define TS_SIGNATURE "rusEFI 2022.09.08.cypress.2785459037" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 11784d12ce..dc9f67f027 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 387675106 -#define TS_SIGNATURE "rusEFI 2022.09.08.f407-discovery.387675106" +#define SIGNATURE_HASH 2785459037 +#define TS_SIGNATURE "rusEFI 2022.09.08.f407-discovery.2785459037" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 842fae203f..c75c932ef8 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 387675106 -#define TS_SIGNATURE "rusEFI 2022.09.08.f429-discovery.387675106" +#define SIGNATURE_HASH 2785459037 +#define TS_SIGNATURE "rusEFI 2022.09.08.f429-discovery.2785459037" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0b481a5d8d..114e330743 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1433898790 -#define TS_SIGNATURE "rusEFI 2022.09.08.frankenso_na6.1433898790" +#define SIGNATURE_HASH 3832170393 +#define TS_SIGNATURE "rusEFI 2022.09.08.frankenso_na6.3832170393" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index a473fe5519..a454cfdbb3 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3890640589 -#define TS_SIGNATURE "rusEFI 2022.09.08.harley81.3890640589" +#define SIGNATURE_HASH 1459338866 +#define TS_SIGNATURE "rusEFI 2022.09.08.harley81.1459338866" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 8c31d6214d..a9c3adec70 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2742875732 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen-gm-e67.2742875732" +#define SIGNATURE_HASH 308362987 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen-gm-e67.308362987" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 544af981a7..fd74bb4bb5 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3465560622 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen-nb1.3465560622" +#define SIGNATURE_HASH 2139982481 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen-nb1.2139982481" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 7a1cabecef..e7ebbee264 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2680539912 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen121nissan.2680539912" +#define SIGNATURE_HASH 785908663 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen121nissan.785908663" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index d8ca181d76..887255d72c 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1731899544 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen121vag.1731899544" +#define SIGNATURE_HASH 3592910887 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen121vag.3592910887" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 448e9236d9..c644537324 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3924119260 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen128.3924119260" +#define SIGNATURE_HASH 1492682339 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen128.1492682339" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index c1f4636358..0d7df8e1fd 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2404647270 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen154hyundai.2404647270" +#define SIGNATURE_HASH 1045023193 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen154hyundai.1045023193" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 5337c34eae..1c2ba5abd0 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3844365030 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen72.3844365030" +#define SIGNATURE_HASH 1413059161 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen72.1413059161" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index f7de9e6863..b741258e61 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 900639720 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen81.900639720" +#define SIGNATURE_HASH 2226348887 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen81.2226348887" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 0885960339..243eb6f3c3 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 49176622 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellen88bmw.49176622" +#define SIGNATURE_HASH 3019090065 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellen88bmw.3019090065" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 6e8a6af126..952d9d3718 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3538496864 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellenNA6.3538496864" +#define SIGNATURE_HASH 1676994015 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellenNA6.1676994015" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 22cc6163c0..5b099ac30e 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3071459850 -#define TS_SIGNATURE "rusEFI 2022.09.08.hellenNA8_96.3071459850" +#define SIGNATURE_HASH 101649077 +#define TS_SIGNATURE "rusEFI 2022.09.08.hellenNA8_96.101649077" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 0ee44aa9e7..7d7d36751b 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 2144129326 -#define TS_SIGNATURE "rusEFI 2022.09.08.kin.2144129326" +#define SIGNATURE_HASH 3469810065 +#define TS_SIGNATURE "rusEFI 2022.09.08.kin.3469810065" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 1294dd24ac..494be4737a 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3637378836 -#define TS_SIGNATURE "rusEFI 2022.09.08.mre_f4.3637378836" +#define SIGNATURE_HASH 1775253419 +#define TS_SIGNATURE "rusEFI 2022.09.08.mre_f4.1775253419" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a82b3b2131..f05f61e3ed 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3637378836 -#define TS_SIGNATURE "rusEFI 2022.09.08.mre_f7.3637378836" +#define SIGNATURE_HASH 1775253419 +#define TS_SIGNATURE "rusEFI 2022.09.08.mre_f7.1775253419" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index f785e05479..d12e1d4d4b 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1207020036 -#define TS_SIGNATURE "rusEFI 2022.09.08.prometheus_405.1207020036" +#define SIGNATURE_HASH 4142686907 +#define TS_SIGNATURE "rusEFI 2022.09.08.prometheus_405.4142686907" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 027d2d2327..feb2eb1aca 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1207020036 -#define TS_SIGNATURE "rusEFI 2022.09.08.prometheus_469.1207020036" +#define SIGNATURE_HASH 4142686907 +#define TS_SIGNATURE "rusEFI 2022.09.08.prometheus_469.4142686907" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8e61f29d60..860bbe3b21 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3000415380 -#define TS_SIGNATURE "rusEFI 2022.09.08.proteus_f4.3000415380" +#define SIGNATURE_HASH 63667243 +#define TS_SIGNATURE "rusEFI 2022.09.08.proteus_f4.63667243" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 320325e915..7ffd5d8c3a 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3000415380 -#define TS_SIGNATURE "rusEFI 2022.09.08.proteus_f7.3000415380" +#define SIGNATURE_HASH 63667243 +#define TS_SIGNATURE "rusEFI 2022.09.08.proteus_f7.63667243" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 838230b2dc..135f310a4f 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3000415380 -#define TS_SIGNATURE "rusEFI 2022.09.08.proteus_h7.3000415380" +#define SIGNATURE_HASH 63667243 +#define TS_SIGNATURE "rusEFI 2022.09.08.proteus_h7.63667243" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index ee6d7a6dc0..0ad65a4a1d 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 1845865016 -#define TS_SIGNATURE "rusEFI 2022.09.08.subaru_eg33_f7.1845865016" +#define SIGNATURE_HASH 3742917255 +#define TS_SIGNATURE "rusEFI 2022.09.08.subaru_eg33_f7.3742917255" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 25a2c71974..6d812be22e 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3172187574 -#define TS_SIGNATURE "rusEFI 2022.09.08.tdg-pdm8.3172187574" +#define SIGNATURE_HASH 202274057 +#define TS_SIGNATURE "rusEFI 2022.09.08.tdg-pdm8.202274057" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index fcfa214d76..7fc0f7deec 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -21,8 +21,6 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.sd_msd; if (strEqualCaseInsensitive(name, "isFan2On")) return engine->outputChannels.isFan2On; - if (strEqualCaseInsensitive(name, "alternatorOnOff")) - return engine->outputChannels.alternatorOnOff; if (strEqualCaseInsensitive(name, "toothLogReady")) return engine->outputChannels.toothLogReady; if (strEqualCaseInsensitive(name, "isTpsError")) diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index aa3b24e151..045593bef2 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -354,8 +354,6 @@ float getConfigValueByName(const char *name) { return engineConfiguration->verboseTLE8888; if (strEqualCaseInsensitive(name, "enableVerboseCanTx")) return engineConfiguration->enableVerboseCanTx; - if (strEqualCaseInsensitive(name, "onOffAlternatorLogic")) - return engineConfiguration->onOffAlternatorLogic; if (strEqualCaseInsensitive(name, "isCJ125Enabled")) return engineConfiguration->isCJ125Enabled; if (strEqualCaseInsensitive(name, "vvtCamSensorUseRise")) @@ -1350,11 +1348,6 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->enableVerboseCanTx = (int)value; return; } - if (strEqualCaseInsensitive(name, "onOffAlternatorLogic")) - { - engineConfiguration->onOffAlternatorLogic = (int)value; - return; - } if (strEqualCaseInsensitive(name, "isCJ125Enabled")) { engineConfiguration->isCJ125Enabled = (int)value; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 6b477709f9..dff2b7160a 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.all.387675106" + signature = "rusEFI 2022.09.08.all.2785459037" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.all.387675106" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.all.2785459037" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:41:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:31 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7065,20 +7063,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 740e3f7626..7b6229105f 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.48way.3963821" + signature = "rusEFI 2022.09.08.48way.2971775762" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.48way.3963821" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.48way.2971775762" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:13 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7061,20 +7059,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index bba11b3a0d..511a5bb248 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.alphax-2chan.621407886" + signature = "rusEFI 2022.09.08.alphax-2chan.2484348465" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.alphax-2chan.621407886" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.alphax-2chan.2484348465" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:44 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7046,20 +7044,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index a0aa38c3e1..6da321e9ee 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.alphax-4chan.2617749613" + signature = "rusEFI 2022.09.08.alphax-4chan.756709586" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.alphax-4chan.2617749613" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.alphax-4chan.756709586" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:46 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7050,20 +7048,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 3fc01dfa8d..cc3d4d94a7 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.atlas.198280901" + signature = "rusEFI 2022.09.08.atlas.3133951610" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.atlas.198280901" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.atlas.3133951610" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:28 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7057,20 +7055,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index edd0c11dbd..4840d27814 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.core8.3791069723" + signature = "rusEFI 2022.09.08.core8.1357572772" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.core8.3791069723" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.core8.1357572772" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:11 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7061,20 +7059,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 1e93c8e114..5b2e197009 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.cypress.387675106" + signature = "rusEFI 2022.09.08.cypress.2785459037" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.cypress.387675106" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.cypress.2785459037" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 08 02:40:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 08 02:50:41 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7065,20 +7063,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index f6a86aa4c3..49312fa5cb 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.f407-discovery.387675106" + signature = "rusEFI 2022.09.08.f407-discovery.2785459037" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.f407-discovery.387675106" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.f407-discovery.2785459037" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:25 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7065,20 +7063,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 2652fefc17..72a1093ce6 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.f429-discovery.387675106" + signature = "rusEFI 2022.09.08.f429-discovery.2785459037" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.f429-discovery.387675106" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.f429-discovery.2785459037" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:26 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7065,20 +7063,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 2a99033265..2938d830ed 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.frankenso_na6.1433898790" + signature = "rusEFI 2022.09.08.frankenso_na6.3832170393" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.frankenso_na6.1433898790" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.frankenso_na6.3832170393" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:15 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7065,20 +7063,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index e71d58fcb5..f37ea86a5d 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.harley81.3890640589" + signature = "rusEFI 2022.09.08.harley81.1459338866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.harley81.3890640589" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.harley81.1459338866" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:48 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7047,20 +7045,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index cd85372f02..647cce4f36 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen-gm-e67.2742875732" + signature = "rusEFI 2022.09.08.hellen-gm-e67.308362987" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen-gm-e67.2742875732" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen-gm-e67.308362987" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:03 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7050,20 +7048,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 731d2e17af..bb6b1f2e2b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen-nb1.3465560622" + signature = "rusEFI 2022.09.08.hellen-nb1.2139982481" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen-nb1.3465560622" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen-nb1.2139982481" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:01 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7050,20 +7048,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 20c5a83a7f..edeb456679 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen121nissan.2680539912" + signature = "rusEFI 2022.09.08.hellen121nissan.785908663" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen121nissan.2680539912" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen121nissan.785908663" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:53 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7047,20 +7045,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 367e458f7c..1979e4a2f5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen121vag.1731899544" + signature = "rusEFI 2022.09.08.hellen121vag.3592910887" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen121vag.1731899544" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen121vag.3592910887" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:51 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7050,20 +7048,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 0148a1376b..21c77a9b8b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen128.3924119260" + signature = "rusEFI 2022.09.08.hellen128.1492682339" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen128.3924119260" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen128.1492682339" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:50 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7047,20 +7045,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 6c4f3126c7..ed697cc304 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen154hyundai.2404647270" + signature = "rusEFI 2022.09.08.hellen154hyundai.1045023193" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen154hyundai.2404647270" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen154hyundai.1045023193" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:54 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7047,20 +7045,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index f5ea615424..44f50aacec 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen72.3844365030" + signature = "rusEFI 2022.09.08.hellen72.1413059161" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen72.3844365030" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen72.1413059161" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:58 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7050,20 +7048,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 3258caecfe..bdecadf036 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen81.900639720" + signature = "rusEFI 2022.09.08.hellen81.2226348887" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen81.900639720" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen81.2226348887" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:00 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7048,20 +7046,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 7e7ddbd38e..a6259c6b7c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellen88bmw.49176622" + signature = "rusEFI 2022.09.08.hellen88bmw.3019090065" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellen88bmw.49176622" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellen88bmw.3019090065" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:56 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7047,20 +7045,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 44bc6826cb..7ba6030719 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellenNA6.3538496864" + signature = "rusEFI 2022.09.08.hellenNA6.1676994015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellenNA6.3538496864" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellenNA6.1676994015" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:05 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7050,20 +7048,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index b6d46a38d6..ada370f4ad 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.hellenNA8_96.3071459850" + signature = "rusEFI 2022.09.08.hellenNA8_96.101649077" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.hellenNA8_96.3071459850" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.hellenNA8_96.101649077" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:06 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7050,20 +7048,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 4d40c89695..b42c71c3f0 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.kin.2144129326" + signature = "rusEFI 2022.09.08.kin.3469810065" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.kin.2144129326" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.kin.3469810065" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 08 02:40:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 08 02:50:40 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7066,20 +7064,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d9d6954ed8..27be7ddc62 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.mre_f4.3637378836" + signature = "rusEFI 2022.09.08.mre_f4.1775253419" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.mre_f4.3637378836" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.mre_f4.1775253419" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:09 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7048,20 +7046,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 51c36c3413..4b1b85a481 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.mre_f7.3637378836" + signature = "rusEFI 2022.09.08.mre_f7.1775253419" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.mre_f7.3637378836" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.mre_f7.1775253419" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:08 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7048,20 +7046,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index db7edc50ec..b6bcbe69b9 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.prometheus_405.1207020036" + signature = "rusEFI 2022.09.08.prometheus_405.4142686907" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.prometheus_405.1207020036" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.prometheus_405.4142686907" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:18 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7059,20 +7057,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index c949304e2b..f9ee038771 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.prometheus_469.1207020036" + signature = "rusEFI 2022.09.08.prometheus_469.4142686907" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.prometheus_469.1207020036" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.prometheus_469.4142686907" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:16 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7059,20 +7057,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index ee72ddb00f..094901d784 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.proteus_f4.3000415380" + signature = "rusEFI 2022.09.08.proteus_f4.63667243" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.proteus_f4.3000415380" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.proteus_f4.63667243" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:21 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7041,20 +7039,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 73b3e324f7..c49a829bd3 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.proteus_f7.3000415380" + signature = "rusEFI 2022.09.08.proteus_f7.63667243" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.proteus_f7.3000415380" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.proteus_f7.63667243" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:19 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7041,20 +7039,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 27d1777263..273eeacb39 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.proteus_h7.3000415380" + signature = "rusEFI 2022.09.08.proteus_h7.63667243" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.proteus_h7.3000415380" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.proteus_h7.63667243" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:23 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7041,20 +7039,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index f692905e08..29066c81d0 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.subaru_eg33_f7.1845865016" + signature = "rusEFI 2022.09.08.subaru_eg33_f7.3742917255" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.subaru_eg33_f7.1845865016" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.subaru_eg33_f7.3742917255" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Sep 08 02:50:43 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7059,20 +7057,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index cb01ba5db3..da042fcde3 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.09.08.tdg-pdm8.3172187574" + signature = "rusEFI 2022.09.08.tdg-pdm8.202274057" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.08.tdg-pdm8.3172187574" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.08.tdg-pdm8.202274057" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:40:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:30 UTC 2022 pageSize = 21300 page = 1 @@ -357,7 +357,7 @@ useTpicAdvancedMode = bits, U32, 764, [11:11], "false", "true" useLcdScreen = bits, U32, 764, [12:12], "false", "true" verboseTLE8888 = bits, U32, 764, [13:13], "false", "true" enableVerboseCanTx = bits, U32, 764, [14:14], "false", "true" -onOffAlternatorLogic = bits, U32, 764, [15:15], "false", "true" +unusedAlteOnOff = bits, U32, 764, [15:15], "false", "true" isCJ125Enabled = bits, U32, 764, [16:16], "false", "true" vvtCamSensorUseRise = bits, U32, 764, [17:17], "Falling", "Rising" measureMapOnlyInOneCylinder = bits, U32, 764, [18:18], "false", "true" @@ -1539,7 +1539,6 @@ maxKnockRetardRpmBins = array, U08, 21294, [6], "RPM", 100.0, 0, 0, 25000, 0 rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed." enableVerboseCanTx = "CAN broadcast using custom rusEFI protocol" - onOffAlternatorLogic = "This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control." isCJ125Enabled = "enable cj125/disable cj125" vvtCamSensorUseRise = "Use rise or fall signal front" measureMapOnlyInOneCylinder = "Useful for individual intakes" @@ -2136,7 +2135,7 @@ checkEngine = bits, U32, 0, [8:8] needBurn = bits, U32, 0, [9:9] sd_msd = bits, U32, 0, [10:10] isFan2On = bits, U32, 0, [11:11] -alternatorOnOff = bits, U32, 0, [12:12] +unusedBitLAtwfs = bits, U32, 0, [12:12] toothLogReady = bits, U32, 0, [13:13] unused3123 = bits, U32, 0, [14:14] isTpsError = bits, U32, 0, [15:15] @@ -4480,7 +4479,6 @@ entry = checkEngine, "checkEngine", int, "%d" entry = needBurn, "needBurn", int, "%d" entry = sd_msd, "sd_msd", int, "%d" entry = isFan2On, "isFan2On", int, "%d" -entry = alternatorOnOff, "alternatorOnOff", int, "%d" entry = toothLogReady, "toothLogReady", int, "%d" entry = isTpsError, "isTpsError", int, "%d" entry = isCltError, "isCltError", int, "%d" @@ -7065,20 +7063,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "Battery Input Divider Coefficient", vbattDividerCoeff dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled - field = "simple on/off mode", onOffAlternatorLogic, {isAlternatorControlEnabled == 1} field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} - field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} field = "#PID control" - field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} - field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} + field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1} + field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1} + field = "I factor", alternatorControl_iFactor, {isAlternatorControlEnabled == 1} + field = "D factor", alternatorControl_dFactor, {isAlternatorControlEnabled == 1} + field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1} + field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" 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 647bada3dc..75538e18f7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 07 23:51:41 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 08 02:51:33 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1707,7 +1707,6 @@ public class Fields { public static final int oilPressure_v2_offset = 2052; public static final int oilPressure_value1_offset = 2048; public static final int oilPressure_value2_offset = 2056; - public static final int onOffAlternatorLogic_offset = 764; public static final int operation_mode_e_FOUR_STROKE_CAM_SENSOR = 2; public static final int operation_mode_e_FOUR_STROKE_CRANK_SENSOR = 1; public static final int operation_mode_e_FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR = 4; @@ -1877,7 +1876,6 @@ public class Fields { public static final int sensorChartMode_offset = 955; public static final int sensorSnifferRpmThreshold_offset = 4; public static final int showHumanReadableWarning_offset = 960; - public static final int SIGNATURE_HASH = 387675106; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2379,7 +2377,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 2022.09.08.all.387675106"; + public static final String TS_SIGNATURE = "rusEFI 2022.09.08.all.2785459037"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1248; @@ -2426,6 +2424,7 @@ public class Fields { public static final int unused_1484_bit_30_offset = 1372; public static final int unused_1484_bit_31_offset = 1372; public static final int unused_1484_bit_38_offset = 1372; + public static final int unusedAlteOnOff_offset = 764; public static final int unusedBit_45_31_offset = 120; public static final int unusedBit_539_10_offset = 1628; public static final int unusedBit_539_11_offset = 1628; @@ -2874,7 +2873,7 @@ public class Fields { public static final Field USELCDSCREEN = Field.create("USELCDSCREEN", 764, FieldType.BIT, 12); public static final Field VERBOSETLE8888 = Field.create("VERBOSETLE8888", 764, FieldType.BIT, 13); public static final Field ENABLEVERBOSECANTX = Field.create("ENABLEVERBOSECANTX", 764, FieldType.BIT, 14); - public static final Field ONOFFALTERNATORLOGIC = Field.create("ONOFFALTERNATORLOGIC", 764, FieldType.BIT, 15); + public static final Field UNUSEDALTEONOFF = Field.create("UNUSEDALTEONOFF", 764, FieldType.BIT, 15); public static final Field ISCJ125ENABLED = Field.create("ISCJ125ENABLED", 764, FieldType.BIT, 16); public static final Field VVTCAMSENSORUSERISE = Field.create("VVTCAMSENSORUSERISE", 764, FieldType.BIT, 17); public static final Field MEASUREMAPONLYINONECYLINDER = Field.create("MEASUREMAPONLYINONECYLINDER", 764, FieldType.BIT, 18); @@ -4251,7 +4250,7 @@ public class Fields { USELCDSCREEN, VERBOSETLE8888, ENABLEVERBOSECANTX, - ONOFFALTERNATORLOGIC, + UNUSEDALTEONOFF, ISCJ125ENABLED, VVTCAMSENSORUSERISE, MEASUREMAPONLYINONECYLINDER, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 6afe349e80..0e53cb04bd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Sep 06 20:36:51 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Sep 08 02:50:38 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -398,7 +398,7 @@ public class TsOutputs { public static final Field NEEDBURN = Field.create("NEEDBURN", 0, FieldType.BIT, 9); public static final Field SD_MSD = Field.create("SD_MSD", 0, FieldType.BIT, 10); public static final Field ISFAN2ON = Field.create("ISFAN2ON", 0, FieldType.BIT, 11); - public static final Field ALTERNATORONOFF = Field.create("ALTERNATORONOFF", 0, FieldType.BIT, 12); + public static final Field UNUSEDBITLATWFS = Field.create("UNUSEDBITLATWFS", 0, FieldType.BIT, 12); public static final Field TOOTHLOGREADY = Field.create("TOOTHLOGREADY", 0, FieldType.BIT, 13); public static final Field UNUSED3123 = Field.create("UNUSED3123", 0, FieldType.BIT, 14); public static final Field ISTPSERROR = Field.create("ISTPSERROR", 0, FieldType.BIT, 15); @@ -946,7 +946,7 @@ public class TsOutputs { NEEDBURN, SD_MSD, ISFAN2ON, - ALTERNATORONOFF, + UNUSEDBITLATWFS, TOOTHLOGREADY, UNUSED3123, ISTPSERROR,