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 d086cb1ce2..469e3d3b9b 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 Mon Feb 06 13:14:59 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:36 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4374,33 +4374,39 @@ struct engine_configuration_s { sec * offset 3944 */ - float alsMaxDuration; + int16_t ALSMaxDuration; /** C - * offset 3948 + * offset 3946 */ int8_t ALSMinCLT; /** C - * offset 3949 + * offset 3947 */ int8_t ALSMaxCLT; /** - * offset 3950 + * offset 3948 */ uint8_t alsMinTimeBetween; /** - * offset 3951 + * offset 3949 */ uint8_t alsEtbPosition; /** - * offset 3952 + * offset 3950 */ uint8_t acRelayAlternatorDutyAdder; /** - * offset 3953 + * offset 3951 */ uint8_t unusedA11lignmentFill_at_33[3]; + /** + * need 4 byte alignment + units + * offset 3954 + */ + uint8_t alignmentFill_at_3954[2]; /** % * offset 3956 @@ -5247,4 +5253,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22432); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 06 13:14:59 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:36 UTC 2023 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 617e15b574..6e229d49a0 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1045,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 414938236 +#define SIGNATURE_HASH 2204522108 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1321,7 +1321,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.06.cypress.414938236" +#define TS_SIGNATURE "rusEFI master.2023.02.06.cypress.2204522108" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 9588127f76..7105fccdc6 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 Mon Feb 06 13:14:58 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:35 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4374,33 +4374,39 @@ struct engine_configuration_s { sec * offset 3944 */ - float alsMaxDuration; + int16_t ALSMaxDuration; /** C - * offset 3948 + * offset 3946 */ int8_t ALSMinCLT; /** C - * offset 3949 + * offset 3947 */ int8_t ALSMaxCLT; /** - * offset 3950 + * offset 3948 */ uint8_t alsMinTimeBetween; /** - * offset 3951 + * offset 3949 */ uint8_t alsEtbPosition; /** - * offset 3952 + * offset 3950 */ uint8_t acRelayAlternatorDutyAdder; /** - * offset 3953 + * offset 3951 */ uint8_t unusedA11lignmentFill_at_33[3]; + /** + * need 4 byte alignment + units + * offset 3954 + */ + uint8_t alignmentFill_at_3954[2]; /** % * offset 3956 @@ -5247,4 +5253,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22432); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 06 13:14:58 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:35 UTC 2023 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 816076a7e1..bcbe0c3783 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1045,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 1886181040 +#define SIGNATURE_HASH 3954308272 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1321,7 +1321,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.06.kin.1886181040" +#define TS_SIGNATURE "rusEFI master.2023.02.06.kin.3954308272" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index a4c5af8cb5..b6eea3904e 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 Mon Feb 06 13:15:00 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:37 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4374,33 +4374,39 @@ struct engine_configuration_s { sec * offset 3944 */ - float alsMaxDuration; + int16_t ALSMaxDuration; /** C - * offset 3948 + * offset 3946 */ int8_t ALSMinCLT; /** C - * offset 3949 + * offset 3947 */ int8_t ALSMaxCLT; /** - * offset 3950 + * offset 3948 */ uint8_t alsMinTimeBetween; /** - * offset 3951 + * offset 3949 */ uint8_t alsEtbPosition; /** - * offset 3952 + * offset 3950 */ uint8_t acRelayAlternatorDutyAdder; /** - * offset 3953 + * offset 3951 */ uint8_t unusedA11lignmentFill_at_33[3]; + /** + * need 4 byte alignment + units + * offset 3954 + */ + uint8_t alignmentFill_at_3954[2]; /** % * offset 3956 @@ -5247,4 +5253,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22432); // 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 Mon Feb 06 13:15:00 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:37 UTC 2023 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 106c9e51cc..c37cd02649 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 @@ -995,7 +995,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1638247846 +#define SIGNATURE_HASH 4202205094 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1272,7 +1272,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.06.subaru_eg33_f7.1638247846" +#define TS_SIGNATURE "rusEFI master.2023.02.06.subaru_eg33_f7.4202205094" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 12f3d3ce28..5bb883694d 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -361,6 +361,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 6f7e29b265..5b1e5b871d 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -93,6 +93,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 1fbe2c20e0..74d14a4a5d 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -532,6 +532,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 diff --git a/firmware/controllers/algo/antilag_system_state_generated.h b/firmware/controllers/algo/antilag_system_state_generated.h index 6a45d39ee7..f64e53556d 100644 --- a/firmware/controllers/algo/antilag_system_state_generated.h +++ b/firmware/controllers/algo/antilag_system_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Wed Dec 28 00:47:56 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Mon Feb 06 23:06:34 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -34,73 +34,73 @@ struct antilag_system_state_s { bool ALSSwitchCondition : 1 {}; /** offset 0 bit 9 */ - bool unusedBit_9_9 : 1 {}; + bool ALSTimerCondition : 1 {}; /** offset 0 bit 10 */ - bool unusedBit_9_10 : 1 {}; + bool unusedBit_10_10 : 1 {}; /** offset 0 bit 11 */ - bool unusedBit_9_11 : 1 {}; + bool unusedBit_10_11 : 1 {}; /** offset 0 bit 12 */ - bool unusedBit_9_12 : 1 {}; + bool unusedBit_10_12 : 1 {}; /** offset 0 bit 13 */ - bool unusedBit_9_13 : 1 {}; + bool unusedBit_10_13 : 1 {}; /** offset 0 bit 14 */ - bool unusedBit_9_14 : 1 {}; + bool unusedBit_10_14 : 1 {}; /** offset 0 bit 15 */ - bool unusedBit_9_15 : 1 {}; + bool unusedBit_10_15 : 1 {}; /** offset 0 bit 16 */ - bool unusedBit_9_16 : 1 {}; + bool unusedBit_10_16 : 1 {}; /** offset 0 bit 17 */ - bool unusedBit_9_17 : 1 {}; + bool unusedBit_10_17 : 1 {}; /** offset 0 bit 18 */ - bool unusedBit_9_18 : 1 {}; + bool unusedBit_10_18 : 1 {}; /** offset 0 bit 19 */ - bool unusedBit_9_19 : 1 {}; + bool unusedBit_10_19 : 1 {}; /** offset 0 bit 20 */ - bool unusedBit_9_20 : 1 {}; + bool unusedBit_10_20 : 1 {}; /** offset 0 bit 21 */ - bool unusedBit_9_21 : 1 {}; + bool unusedBit_10_21 : 1 {}; /** offset 0 bit 22 */ - bool unusedBit_9_22 : 1 {}; + bool unusedBit_10_22 : 1 {}; /** offset 0 bit 23 */ - bool unusedBit_9_23 : 1 {}; + bool unusedBit_10_23 : 1 {}; /** offset 0 bit 24 */ - bool unusedBit_9_24 : 1 {}; + bool unusedBit_10_24 : 1 {}; /** offset 0 bit 25 */ - bool unusedBit_9_25 : 1 {}; + bool unusedBit_10_25 : 1 {}; /** offset 0 bit 26 */ - bool unusedBit_9_26 : 1 {}; + bool unusedBit_10_26 : 1 {}; /** offset 0 bit 27 */ - bool unusedBit_9_27 : 1 {}; + bool unusedBit_10_27 : 1 {}; /** offset 0 bit 28 */ - bool unusedBit_9_28 : 1 {}; + bool unusedBit_10_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_9_29 : 1 {}; + bool unusedBit_10_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_9_30 : 1 {}; + bool unusedBit_10_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_9_31 : 1 {}; + bool unusedBit_10_31 : 1 {}; /** * offset 4 */ @@ -120,4 +120,4 @@ struct antilag_system_state_s { static_assert(sizeof(antilag_system_state_s) == 12); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Wed Dec 28 00:47:56 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Mon Feb 06 23:06:34 UTC 2023 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index a6ffcd7dea..d65799c336 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 Mon Feb 06 13:15:51 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:19 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4374,33 +4374,39 @@ struct engine_configuration_s { sec * offset 3944 */ - float alsMaxDuration; + int16_t ALSMaxDuration; /** C - * offset 3948 + * offset 3946 */ int8_t ALSMinCLT; /** C - * offset 3949 + * offset 3947 */ int8_t ALSMaxCLT; /** - * offset 3950 + * offset 3948 */ uint8_t alsMinTimeBetween; /** - * offset 3951 + * offset 3949 */ uint8_t alsEtbPosition; /** - * offset 3952 + * offset 3950 */ uint8_t acRelayAlternatorDutyAdder; /** - * offset 3953 + * offset 3951 */ uint8_t unusedA11lignmentFill_at_33[3]; + /** + * need 4 byte alignment + units + * offset 3954 + */ + uint8_t alignmentFill_at_3954[2]; /** % * offset 3956 @@ -5247,4 +5253,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22432); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:51 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:19 UTC 2023 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index c0f6356b30..95c08ead2f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1045,7 +1045,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 1895066330 +#define SIGNATURE_HASH 3945351386 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1321,7 +1321,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.06.f407-discovery.1895066330" +#define TS_SIGNATURE "rusEFI master.2023.02.06.f407-discovery.3945351386" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index ef0ff3272c..671a919cbd 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 261913651 -#define TS_SIGNATURE "rusEFI master.2023.02.06.48way.261913651" +#define SIGNATURE_HASH 2487311923 +#define TS_SIGNATURE "rusEFI master.2023.02.06.48way.2487311923" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 22c7b95e4a..3e350fc903 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 715778320 -#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-2chan.715778320" +#define SIGNATURE_HASH 2977221392 +#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-2chan.2977221392" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index a14ed5fe15..9aa19f9410 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1473406293 -#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-4chan.1473406293" +#define SIGNATURE_HASH 3423553365 +#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-4chan.3423553365" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index a2ad6eb81d..025ca1e5aa 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2970524370 -#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-8chan.2970524370" +#define SIGNATURE_HASH 718518482 +#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-8chan.718518482" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 0e53119397..b710736b00 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 74547547 -#define TS_SIGNATURE "rusEFI master.2023.02.06.atlas.74547547" +#define SIGNATURE_HASH 2678891355 +#define TS_SIGNATURE "rusEFI master.2023.02.06.atlas.2678891355" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 441542dd8c..c6d6e98822 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3998688645 -#define TS_SIGNATURE "rusEFI master.2023.02.06.core8.3998688645" +#define SIGNATURE_HASH 1971980165 +#define TS_SIGNATURE "rusEFI master.2023.02.06.core8.1971980165" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index d954039717..9b3312140d 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 414938236 -#define TS_SIGNATURE "rusEFI master.2023.02.06.cypress.414938236" +#define SIGNATURE_HASH 2204522108 +#define TS_SIGNATURE "rusEFI master.2023.02.06.cypress.2204522108" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 563e739476..a84aa4e2b3 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1895066330 -#define TS_SIGNATURE "rusEFI master.2023.02.06.f407-discovery.1895066330" +#define SIGNATURE_HASH 3945351386 +#define TS_SIGNATURE "rusEFI master.2023.02.06.f407-discovery.3945351386" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 5bd7b7250e..1b49ad14ca 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 414938236 -#define TS_SIGNATURE "rusEFI master.2023.02.06.f429-discovery.414938236" +#define SIGNATURE_HASH 2204522108 +#define TS_SIGNATURE "rusEFI master.2023.02.06.f429-discovery.2204522108" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 09571d108f..4ddb3539e5 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1524074680 -#define TS_SIGNATURE "rusEFI master.2023.02.06.frankenso_na6.1524074680" +#define SIGNATURE_HASH 3238701752 +#define TS_SIGNATURE "rusEFI master.2023.02.06.frankenso_na6.3238701752" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index cd94ee89e2..31dbb13860 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3581555331 -#define TS_SIGNATURE "rusEFI master.2023.02.06.harley81.3581555331" +#define SIGNATURE_HASH 1319571587 +#define TS_SIGNATURE "rusEFI master.2023.02.06.harley81.1319571587" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index b2a4ef8d3f..5b54fd5384 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 58136440 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-gm-e67.58136440" +#define SIGNATURE_HASH 2561291640 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-gm-e67.2561291640" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 6da6529587..6f36a83bf7 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1995112636 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-honda-k.1995112636" +#define SIGNATURE_HASH 3979748028 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-honda-k.3979748028" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 8ad2584044..ea5b197196 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4109137045 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-nb1.4109137045" +#define SIGNATURE_HASH 1865504405 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-nb1.1865504405" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 9681062b87..2089205d44 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 743623132 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen121nissan.743623132" +#define SIGNATURE_HASH 3079662556 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen121nissan.3079662556" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 65352c5fa4..c45bf126c0 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2315969377 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen121vag.2315969377" +#define SIGNATURE_HASH 299352417 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen121vag.299352417" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index b504f4daf8..95909ed720 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 950995271 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen128.950995271" +#define SIGNATURE_HASH 2742168391 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen128.2742168391" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 3e38a8c99a..7976487c0f 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3143585439 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen154hyundai.3143585439" +#define SIGNATURE_HASH 545418399 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen154hyundai.545418399" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 92a3d848fb..1d68db9898 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3783097079 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen72.3783097079" +#define SIGNATURE_HASH 2057328887 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen72.2057328887" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 6cd48ad317..c65a34de9d 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3103123969 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen81.3103123969" +#define SIGNATURE_HASH 589875201 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen81.589875201" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 5775f5390c..63449f9571 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 223242160 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen88bmw.223242160" +#define SIGNATURE_HASH 2526234032 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen88bmw.2526234032" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 37f6362150..5e7ff07c1a 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1190643019 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellenNA6.1190643019" +#define SIGNATURE_HASH 3710576459 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellenNA6.3710576459" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 9bb186c19a..d2205177a3 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3098723732 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellenNA8_96.3098723732" +#define SIGNATURE_HASH 594536340 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellenNA8_96.594536340" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 1dc5e4fe48..b6f33e1604 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 1886181040 -#define TS_SIGNATURE "rusEFI master.2023.02.06.kin.1886181040" +#define SIGNATURE_HASH 3954308272 +#define TS_SIGNATURE "rusEFI master.2023.02.06.kin.3954308272" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index a8df18ad5b..93dd2c3ac3 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3342182727 -#define TS_SIGNATURE "rusEFI master.2023.02.06.m74_9.3342182727" +#define SIGNATURE_HASH 1558743879 +#define TS_SIGNATURE "rusEFI master.2023.02.06.m74_9.1558743879" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 51d3dcf972..d327d940b4 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2366772092 -#define TS_SIGNATURE "rusEFI master.2023.02.06.mre_f4.2366772092" +#define SIGNATURE_HASH 382677372 +#define TS_SIGNATURE "rusEFI master.2023.02.06.mre_f4.382677372" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a461fe6999..6919e0c7ad 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2366772092 -#define TS_SIGNATURE "rusEFI master.2023.02.06.mre_f7.2366772092" +#define SIGNATURE_HASH 382677372 +#define TS_SIGNATURE "rusEFI master.2023.02.06.mre_f7.382677372" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3e3eb697a1..3d760b191f 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1213312410 -#define TS_SIGNATURE "rusEFI master.2023.02.06.prometheus_405.1213312410" +#define SIGNATURE_HASH 3549204378 +#define TS_SIGNATURE "rusEFI master.2023.02.06.prometheus_405.3549204378" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 9be994c879..6e57babac0 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1213312410 -#define TS_SIGNATURE "rusEFI master.2023.02.06.prometheus_469.1213312410" +#define SIGNATURE_HASH 3549204378 +#define TS_SIGNATURE "rusEFI master.2023.02.06.prometheus_469.3549204378" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e0981000ee..f653c231c5 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 615169996 -#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_f4.615169996" +#define SIGNATURE_HASH 3212287436 +#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_f4.3212287436" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index c0b4f7d544..029b76437c 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 615169996 -#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_f7.615169996" +#define SIGNATURE_HASH 3212287436 +#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_f7.3212287436" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 9f834f3076..35f0ae7a3d 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 615169996 -#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_h7.615169996" +#define SIGNATURE_HASH 3212287436 +#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_h7.3212287436" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 7662edd7fa..b4eeaf03a4 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 325572539 -#define TS_SIGNATURE "rusEFI master.2023.02.06.s105.325572539" +#define SIGNATURE_HASH 2293953979 +#define TS_SIGNATURE "rusEFI master.2023.02.06.s105.2293953979" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 3554e4a1e8..2842f5a5d5 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1638247846 -#define TS_SIGNATURE "rusEFI master.2023.02.06.subaru_eg33_f7.1638247846" +#define SIGNATURE_HASH 4202205094 +#define TS_SIGNATURE "rusEFI master.2023.02.06.subaru_eg33_f7.4202205094" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 12ad9a3754..f764d5f882 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1098749680 -#define TS_SIGNATURE "rusEFI master.2023.02.06.tdg-pdm8.1098749680" +#define SIGNATURE_HASH 3667965168 +#define TS_SIGNATURE "rusEFI master.2023.02.06.tdg-pdm8.3667965168" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 896bf54484..ead2480a80 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -1022,7 +1022,7 @@ float getConfigValueByName(const char *name) { case 1523829850: return engineConfiguration->ALSMaxRPM; case 1830002033: - return engineConfiguration->alsMaxDuration; + return engineConfiguration->ALSMaxDuration; case 1532941388: return engineConfiguration->ALSMinCLT; case 1523813390: @@ -3598,7 +3598,7 @@ void setConfigValueByName(const char *name, float value) { } case 1830002033: { - engineConfiguration->alsMaxDuration = value; + engineConfiguration->ALSMaxDuration = (int)value; return; } case 1532941388: diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index ff1df13da1..4d2c39c48a 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -1525,7 +1525,7 @@ null ### ALSMaxRPM -### alsMaxDuration +### ALSMaxDuration ### ALSMinCLT diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 100475106e..a3ccffb976 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 master.2023.02.06.f407-discovery.1895066330" + signature = "rusEFI master.2023.02.06.f407-discovery.3945351386" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.f407-discovery.1895066330" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.f407-discovery.3945351386" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:49 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:17 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5474,6 +5476,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7900,6 +7903,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index f1640d8745..9b8e40eef7 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 master.2023.02.06.48way.261913651" + signature = "rusEFI master.2023.02.06.48way.2487311923" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.48way.261913651" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.48way.2487311923" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:30 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:01 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5472,6 +5474,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7890,6 +7893,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index ad9a421ea4..5a3621cafc 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 master.2023.02.06.alphax-2chan.715778320" + signature = "rusEFI master.2023.02.06.alphax-2chan.2977221392" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.alphax-2chan.715778320" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.alphax-2chan.2977221392" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:02 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:38 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5468,6 +5470,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7860,6 +7863,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 6c812ae3ff..a5fda05a39 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 master.2023.02.06.alphax-4chan.1473406293" + signature = "rusEFI master.2023.02.06.alphax-4chan.3423553365" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.alphax-4chan.1473406293" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.alphax-4chan.3423553365" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:03 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:39 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7864,6 +7867,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 4f1ad53972..4c6e431ec2 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.06.alphax-8chan.2970524370" + signature = "rusEFI master.2023.02.06.alphax-8chan.718518482" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.alphax-8chan.2970524370" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.alphax-8chan.718518482" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:05 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:41 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7864,6 +7867,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 79535821f7..9abd3927c9 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 master.2023.02.06.atlas.74547547" + signature = "rusEFI master.2023.02.06.atlas.2678891355" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.atlas.74547547" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.atlas.2678891355" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:46 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:14 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5474,6 +5476,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7889,6 +7892,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 0303cf424b..61b1fb447d 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 master.2023.02.06.core8.3998688645" + signature = "rusEFI master.2023.02.06.core8.1971980165" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.core8.3998688645" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.core8.1971980165" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:29 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:00 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5472,6 +5474,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7890,6 +7893,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 02547818e6..951e591f66 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 master.2023.02.06.cypress.414938236" + signature = "rusEFI master.2023.02.06.cypress.2204522108" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.cypress.414938236" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.cypress.2204522108" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 06 13:14:59 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:36 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5474,6 +5476,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7898,6 +7901,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index df3a472fc2..2258380a13 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 master.2023.02.06.f407-discovery.1895066330" + signature = "rusEFI master.2023.02.06.f407-discovery.3945351386" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.f407-discovery.1895066330" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.f407-discovery.3945351386" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:43 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:12 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5474,6 +5476,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7900,6 +7903,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 03d94784f7..db36488630 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 master.2023.02.06.f429-discovery.414938236" + signature = "rusEFI master.2023.02.06.f429-discovery.2204522108" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.f429-discovery.414938236" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.f429-discovery.2204522108" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:45 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:13 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5474,6 +5476,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7898,6 +7901,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 7193d0fea4..7f735e466f 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 master.2023.02.06.frankenso_na6.1524074680" + signature = "rusEFI master.2023.02.06.frankenso_na6.3238701752" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.frankenso_na6.1524074680" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.frankenso_na6.3238701752" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:34 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:05 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5474,6 +5476,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7898,6 +7901,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index dfb2201746..8a0187835a 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 master.2023.02.06.harley81.3581555331" + signature = "rusEFI master.2023.02.06.harley81.1319571587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.harley81.3581555331" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.harley81.1319571587" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:06 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:42 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7862,6 +7865,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 0ddb717973..7ac5844111 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 master.2023.02.06.hellen-gm-e67.58136440" + signature = "rusEFI master.2023.02.06.hellen-gm-e67.2561291640" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen-gm-e67.58136440" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen-gm-e67.2561291640" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:21 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:54 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7862,6 +7865,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 173071ba04..32e7666017 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.06.hellen-honda-k.1995112636" + signature = "rusEFI master.2023.02.06.hellen-honda-k.3979748028" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen-honda-k.1995112636" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen-honda-k.3979748028" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:12 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:47 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7860,6 +7863,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index e76b883a61..53360793d8 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 master.2023.02.06.hellen-nb1.4109137045" + signature = "rusEFI master.2023.02.06.hellen-nb1.1865504405" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen-nb1.4109137045" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen-nb1.1865504405" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:20 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:53 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7863,6 +7866,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index c49c74fa1a..da8a091820 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 master.2023.02.06.hellen121nissan.743623132" + signature = "rusEFI master.2023.02.06.hellen121nissan.3079662556" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen121nissan.743623132" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen121nissan.3079662556" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:11 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:45 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7861,6 +7864,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 23b9c8ba9e..e172e43d09 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 master.2023.02.06.hellen121vag.2315969377" + signature = "rusEFI master.2023.02.06.hellen121vag.299352417" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen121vag.2315969377" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen121vag.299352417" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:09 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:44 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7866,6 +7869,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 46bc0f2f2d..35250f2a77 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 master.2023.02.06.hellen128.950995271" + signature = "rusEFI master.2023.02.06.hellen128.2742168391" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen128.950995271" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen128.2742168391" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:08 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:43 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7861,6 +7864,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 82299bfaa1..48d6412190 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 master.2023.02.06.hellen154hyundai.3143585439" + signature = "rusEFI master.2023.02.06.hellen154hyundai.545418399" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen154hyundai.3143585439" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen154hyundai.545418399" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:14 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:48 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7860,6 +7863,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 38128a9ae9..dc58279076 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 master.2023.02.06.hellen72.3783097079" + signature = "rusEFI master.2023.02.06.hellen72.2057328887" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen72.3783097079" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen72.2057328887" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:17 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:50 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7863,6 +7866,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 68182280b5..fe490222b7 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 master.2023.02.06.hellen81.3103123969" + signature = "rusEFI master.2023.02.06.hellen81.589875201" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen81.3103123969" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen81.589875201" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:18 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:52 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5469,6 +5471,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7859,6 +7862,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index e2b949fccc..cb714f08a5 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 master.2023.02.06.hellen88bmw.223242160" + signature = "rusEFI master.2023.02.06.hellen88bmw.2526234032" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellen88bmw.223242160" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellen88bmw.2526234032" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:15 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:49 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7857,6 +7860,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index f5d96e5c95..937ca71cfa 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 master.2023.02.06.hellenNA6.1190643019" + signature = "rusEFI master.2023.02.06.hellenNA6.3710576459" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellenNA6.1190643019" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellenNA6.3710576459" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:23 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:55 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7864,6 +7867,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index de844967fa..e5afa77428 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 master.2023.02.06.hellenNA8_96.3098723732" + signature = "rusEFI master.2023.02.06.hellenNA8_96.594536340" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.hellenNA8_96.3098723732" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.hellenNA8_96.594536340" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:24 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:57 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7862,6 +7865,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index b5d8927750..23fe6ad780 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 master.2023.02.06.kin.1886181040" + signature = "rusEFI master.2023.02.06.kin.3954308272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.kin.1886181040" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.kin.3954308272" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 06 13:14:58 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 06 23:06:35 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5474,6 +5476,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7899,6 +7902,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 92cb099e9a..91d3e04453 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.06.m74_9.3342182727" + signature = "rusEFI master.2023.02.06.m74_9.1558743879" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.m74_9.3342182727" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.m74_9.1558743879" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:31 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:03 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7864,6 +7867,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 6452d4a8d6..bc4ff75d2d 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 master.2023.02.06.mre_f4.2366772092" + signature = "rusEFI master.2023.02.06.mre_f4.382677372" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.mre_f4.2366772092" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.mre_f4.382677372" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:27 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:59 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5472,6 +5474,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7868,6 +7871,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 743034f9f2..063ed0562a 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 master.2023.02.06.mre_f7.2366772092" + signature = "rusEFI master.2023.02.06.mre_f7.382677372" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.mre_f7.2366772092" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.mre_f7.382677372" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:26 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:58 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5472,6 +5474,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7868,6 +7871,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 9fc6d09674..6cc9b6aef8 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 master.2023.02.06.prometheus_405.1213312410" + signature = "rusEFI master.2023.02.06.prometheus_405.3549204378" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.prometheus_405.1213312410" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.prometheus_405.3549204378" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:37 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:07 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5468,6 +5470,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7892,6 +7895,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index ad0f13b1ea..3323561dce 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 master.2023.02.06.prometheus_469.1213312410" + signature = "rusEFI master.2023.02.06.prometheus_469.3549204378" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.prometheus_469.1213312410" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.prometheus_469.3549204378" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:36 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:06 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5468,6 +5470,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7892,6 +7895,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index ed91d38aad..700ec0ad09 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 master.2023.02.06.proteus_f4.615169996" + signature = "rusEFI master.2023.02.06.proteus_f4.3212287436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.proteus_f4.615169996" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.proteus_f4.3212287436" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:40 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:10 UTC 2023 pageSize = 26432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5468,6 +5470,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7860,6 +7863,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 3767291d73..f67311efe2 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 master.2023.02.06.proteus_f7.615169996" + signature = "rusEFI master.2023.02.06.proteus_f7.3212287436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.proteus_f7.615169996" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.proteus_f7.3212287436" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:39 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:08 UTC 2023 pageSize = 26432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5468,6 +5470,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7860,6 +7863,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index c2a0c33e78..bacf21f6c1 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 master.2023.02.06.proteus_h7.615169996" + signature = "rusEFI master.2023.02.06.proteus_h7.3212287436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.proteus_h7.615169996" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.proteus_h7.3212287436" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:42 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:11 UTC 2023 pageSize = 26432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5468,6 +5470,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7860,6 +7863,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 7d15b3fb82..b28970bb5e 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.06.s105.325572539" + signature = "rusEFI master.2023.02.06.s105.2293953979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.s105.325572539" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.s105.2293953979" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:33 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:04 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5471,6 +5473,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7864,6 +7867,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 11db50ecbe..1e5e272f68 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 master.2023.02.06.subaru_eg33_f7.1638247846" + signature = "rusEFI master.2023.02.06.subaru_eg33_f7.4202205094" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.subaru_eg33_f7.1638247846" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.subaru_eg33_f7.4202205094" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:00 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Feb 06 23:06:37 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5470,6 +5472,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7882,6 +7885,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 2e914d3e31..99e142c8ef 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 master.2023.02.06.tdg-pdm8.1098749680" + signature = "rusEFI master.2023.02.06.tdg-pdm8.3667965168" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.06.tdg-pdm8.1098749680" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.06.tdg-pdm8.3667965168" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:47 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:15 UTC 2023 pageSize = 22432 page = 1 @@ -1201,13 +1201,13 @@ luaDigitalInputPins8 = bits, U16, 3934, [0:7], "NONE", "INVALID", "PA0", "PA1", tpsTspCorrValuesBins = array, U08, 3936, [4], "RPM", 50.0, 0, 0, 17500, 0 ALSMinRPM = scalar, S16, 3940, "rpm", 1, 0, 0, 20000, 0 ALSMaxRPM = scalar, S16, 3942, "rpm", 1, 0, 0, 20000, 0 -alsMaxDuration = scalar, F32, 3944, "sec", 1, 0, 0.01, 100, 2 -ALSMinCLT = scalar, S08, 3948, "C", 1, 0, 0, 90, 0 -ALSMaxCLT = scalar, S08, 3949, "C", 1, 0, 0, 105, 0 -alsMinTimeBetween = scalar, U08, 3950, "", 1, 0, 0, 20000, 0 -alsEtbPosition = scalar, U08, 3951, "", 1, 0, 0, 20000, 0 -acRelayAlternatorDutyAdder = scalar, U08, 3952, "", 1, 0, 0, 100, 0 -unusedA11lignmentFill_at_33 = array, U08, 3953, [3], "", 1, 0, 0, 100, 0 +ALSMaxDuration = scalar, S16, 3944, "sec", 1, 0, 0, 10, 0 +ALSMinCLT = scalar, S08, 3946, "C", 1, 0, 0, 90, 0 +ALSMaxCLT = scalar, S08, 3947, "C", 1, 0, 0, 105, 0 +alsMinTimeBetween = scalar, U08, 3948, "", 1, 0, 0, 20000, 0 +alsEtbPosition = scalar, U08, 3949, "", 1, 0, 0, 20000, 0 +acRelayAlternatorDutyAdder = scalar, U08, 3950, "", 1, 0, 0, 100, 0 +unusedA11lignmentFill_at_33 = array, U08, 3951, [3], "", 1, 0, 0, 100, 0 ALSIdleAdd = scalar, S32, 3956, "%", 1, 0, 0, 100, 2 ALSEtbAdd = scalar, S32, 3960, "%", 1, 0, 0, 100, 2 ALSSkipRatio = scalar, S32, 3964, "", 1, 0, 0.1, 2, 1 @@ -2753,6 +2753,7 @@ ALSMaxThrottleIntentCondition = bits, U32, 904, [5:5] isALSSwitchActivated = bits, U32, 904, [6:6] ALSActivatePinState = bits, U32, 904, [7:7] ALSSwitchCondition = bits, U32, 904, [8:8] +ALSTimerCondition = bits, U32, 904, [9:9] fuelALSCorrection = scalar, F32, 908, "", 1, 0 timingALSCorrection = scalar, S16, 912, "deg", 0.01, 0 ; total TS size = 916 @@ -4699,6 +4700,7 @@ entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" +entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" entry = isTpsInvalid, "isTpsInvalid", int, "%d" @@ -5474,6 +5476,7 @@ indicatorPanel = antilag_system_stateIndicatorPanel, 2 indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" + indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" dialog = antilag_system_stateDialog, "antilag_system_state" panel = antilag_system_stateIndicatorPanel @@ -7898,6 +7901,7 @@ dialog = tcuControls, "Transmission Settings" field = "Switch Input", ALSActivatePin, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != 0 && antiLagEnabled == 1} field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != 0 && antiLagEnabled == 1} + field = "ALS timeout", ALSMaxDuration, {antiLagEnabled == 1} field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java index d77bf31c0e..de7afaa41b 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Mon Feb 06 13:14:57 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Mon Feb 06 23:06:34 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -412,6 +412,7 @@ public class AntilagSystem { public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(904); public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(904); public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(904); + public static final Field ALSTIMERCONDITION = Field.create("ALSTIMERCONDITION", 0, FieldType.BIT, 9).setBaseOffset(904); public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(904); public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(904); public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(904); @@ -425,6 +426,7 @@ public class AntilagSystem { ISALSSWITCHACTIVATED, ALSACTIVATEPINSTATE, ALSSWITCHCONDITION, + ALSTIMERCONDITION, FUELALSCORRECTION, TIMINGALSCORRECTION, ALIGNMENTFILL_AT_10, 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 e10ae20730..4235914bf0 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 13:15:51 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 06 23:07:19 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -993,7 +993,6 @@ public class Fields { public static final int sensor_chart_e_SC_RPM_ACCEL = 3; public static final int sensor_chart_e_SC_TRIGGER = 1; public static final int SENT_INPUT_COUNT = 1; - public static final int SIGNATURE_HASH = 1895066330; public static final int specs_s_size = 12; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; @@ -1203,7 +1202,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2023.02.06.f407-discovery.1895066330"; + public static final String TS_SIGNATURE = "rusEFI master.2023.02.06.f407-discovery.3945351386"; 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 = 1316; @@ -2473,13 +2472,14 @@ public class Fields { public static final Field TPSTSPCORRVALUESBINS = Field.create("TPSTSPCORRVALUESBINS", 3936, FieldType.INT8).setScale(50.0).setBaseOffset(0); public static final Field ALSMINRPM = Field.create("ALSMINRPM", 3940, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field ALSMAXRPM = Field.create("ALSMAXRPM", 3942, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field ALSMAXDURATION = Field.create("ALSMAXDURATION", 3944, FieldType.FLOAT).setBaseOffset(0); - public static final Field ALSMINCLT = Field.create("ALSMINCLT", 3948, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field ALSMAXCLT = Field.create("ALSMAXCLT", 3949, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field ALSMINTIMEBETWEEN = Field.create("ALSMINTIMEBETWEEN", 3950, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field ALSETBPOSITION = Field.create("ALSETBPOSITION", 3951, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field ACRELAYALTERNATORDUTYADDER = Field.create("ACRELAYALTERNATORDUTYADDER", 3952, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDA11LIGNMENTFILL_AT_33 = Field.create("UNUSEDA11LIGNMENTFILL_AT_33", 3953, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ALSMAXDURATION = Field.create("ALSMAXDURATION", 3944, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field ALSMINCLT = Field.create("ALSMINCLT", 3946, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ALSMAXCLT = Field.create("ALSMAXCLT", 3947, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ALSMINTIMEBETWEEN = Field.create("ALSMINTIMEBETWEEN", 3948, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ALSETBPOSITION = Field.create("ALSETBPOSITION", 3949, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ACRELAYALTERNATORDUTYADDER = Field.create("ACRELAYALTERNATORDUTYADDER", 3950, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDA11LIGNMENTFILL_AT_33 = Field.create("UNUSEDA11LIGNMENTFILL_AT_33", 3951, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ALIGNMENTFILL_AT_3954 = Field.create("ALIGNMENTFILL_AT_3954", 3954, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field ALSIDLEADD = Field.create("ALSIDLEADD", 3956, FieldType.INT).setScale(1.0).setBaseOffset(0); public static final Field ALSETBADD = Field.create("ALSETBADD", 3960, FieldType.INT).setScale(1.0).setBaseOffset(0); public static final Field ALSSKIPRATIO = Field.create("ALSSKIPRATIO", 3964, FieldType.INT).setScale(1.0).setBaseOffset(0); @@ -3922,6 +3922,7 @@ public class Fields { ALSETBPOSITION, ACRELAYALTERNATORDUTYADDER, UNUSEDA11LIGNMENTFILL_AT_33, + ALIGNMENTFILL_AT_3954, ALSIDLEADD, ALSETBADD, ALSSKIPRATIO,