From 70209c59539d9bb88113a6c2c657a9c331763963 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 20 Apr 2022 00:09:40 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 6 ++-- .../controllers/algo/rusefi_generated.h | 8 ++--- ...ngine_configuration_generated_structures.h | 6 ++-- .../controllers/algo/rusefi_generated.h | 8 ++--- ...ngine_configuration_generated_structures.h | 6 ++-- .../controllers/algo/rusefi_generated.h | 8 ++--- ...ngine_configuration_generated_structures.h | 6 ++-- .../controllers/generated/rusefi_generated.h | 8 ++--- .../controllers/generated/signature_all.h | 4 +-- .../generated/signature_alphax-2chan.h | 4 +-- .../generated/signature_alphax-4chan.h | 4 +-- .../controllers/generated/signature_atlas.h | 4 +-- .../controllers/generated/signature_core8.h | 4 +-- .../generated/signature_f429-discovery.h | 4 +-- .../generated/signature_frankenso_na6.h | 4 +-- .../generated/signature_harley81.h | 4 +-- .../generated/signature_hellen-nb1.h | 4 +-- .../generated/signature_hellen121nissan.h | 4 +-- .../generated/signature_hellen121vag.h | 4 +-- .../generated/signature_hellen128.h | 4 +-- .../generated/signature_hellen154hyundai.h | 4 +-- .../generated/signature_hellen72.h | 4 +-- .../generated/signature_hellen81.h | 4 +-- .../generated/signature_hellen88bmw.h | 4 +-- .../generated/signature_hellenNA6.h | 4 +-- .../generated/signature_hellenNA8_96.h | 4 +-- .../generated/signature_hellen_cypress.h | 4 +-- .../controllers/generated/signature_kin.h | 4 +-- .../controllers/generated/signature_mre_f4.h | 4 +-- .../controllers/generated/signature_mre_f7.h | 4 +-- .../generated/signature_prometheus_405.h | 4 +-- .../generated/signature_prometheus_469.h | 4 +-- .../generated/signature_proteus_f4.h | 4 +-- .../generated/signature_proteus_f7.h | 4 +-- .../generated/signature_proteus_h7.h | 4 +-- .../generated/signature_subaru_eg33_f7.h | 4 +-- .../generated/signature_tdg-pdm8.h | 4 +-- .../lua/generated/value_lookup_generated.cpp | 7 ++++ firmware/tunerstudio/generated/rusefi.ini | 35 +++++++++++-------- .../generated/rusefi_alphax-2chan.ini | 35 +++++++++++-------- .../generated/rusefi_alphax-4chan.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_atlas.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_core8.ini | 35 +++++++++++-------- .../generated/rusefi_f429-discovery.ini | 35 +++++++++++-------- .../generated/rusefi_frankenso_na6.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_harley81.ini | 35 +++++++++++-------- .../generated/rusefi_hellen-nb1.ini | 35 +++++++++++-------- .../generated/rusefi_hellen121nissan.ini | 35 +++++++++++-------- .../generated/rusefi_hellen121vag.ini | 35 +++++++++++-------- .../generated/rusefi_hellen128mercedes.ini | 35 +++++++++++-------- .../generated/rusefi_hellen154hyundai.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_hellen72.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_hellen81.ini | 35 +++++++++++-------- .../generated/rusefi_hellen88bmw.ini | 35 +++++++++++-------- .../generated/rusefi_hellenNA6.ini | 35 +++++++++++-------- .../generated/rusefi_hellenNA8_96.ini | 35 +++++++++++-------- .../generated/rusefi_hellen_cypress.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_kinetis.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_mre_f4.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_mre_f7.ini | 35 +++++++++++-------- .../generated/rusefi_prometheus_405.ini | 35 +++++++++++-------- .../generated/rusefi_prometheus_469.ini | 35 +++++++++++-------- .../generated/rusefi_proteus_f4.ini | 35 +++++++++++-------- .../generated/rusefi_proteus_f7.ini | 35 +++++++++++-------- .../generated/rusefi_proteus_h7.ini | 35 +++++++++++-------- .../generated/rusefi_subaru_eg33_f7.ini | 35 +++++++++++-------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 35 +++++++++++-------- .../com/rusefi/config/generated/Fields.java | 13 +++---- 68 files changed, 680 insertions(+), 527 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 2c380c0bc7..07e1dccc1d 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Apr 19 14:54:58 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Apr 20 00:07:31 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2401,7 +2401,7 @@ struct engine_configuration_s { bool useFSIO4ForSeriousEngineWarning : 1 {}; /** offset 1260 bit 29 */ - bool unusedBitHere2 : 1 {}; + bool launchActivateInverted : 1 {}; /** offset 1260 bit 30 */ bool twoStroke : 1 {}; @@ -4678,4 +4678,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21148); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Apr 19 14:54:58 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Apr 20 00:07:31 UTC 2022 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index d98b3109d8..5c3d6bc1af 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1599,12 +1599,13 @@ #define lambdaRpmBins_offset 19660 #define lambdaTable_offset 19372 #define launchActivateDelay_offset 976 +#define launchActivateInverted_offset 1260 #define launchActivatePin_offset 911 #define launchActivatePinMode_offset 1747 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 #define launchActivationMode_e_auto_enum "SWITCH_INPUT_LAUNCH", "CLUTCH_INPUT_LAUNCH", "ALWAYS_ACTIVE_LAUNCH" #define launchActivationMode_e_CLUTCH_INPUT_LAUNCH 1 -#define launchActivationMode_e_enum "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +#define launchActivationMode_e_enum "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" #define launchActivationMode_e_Force_4bytes_size_launchActivationMode_e ENUM_32_BITS #define launchActivationMode_e_SWITCH_INPUT_LAUNCH 0 #define launchActivationMode_offset 940 @@ -1950,7 +1951,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 3748869712 +#define SIGNATURE_HASH 311435812 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2528,7 +2529,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen_cypress.3748869712" +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen_cypress.311435812" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2609,7 +2610,6 @@ #define unusedBit_507_31_offset 1740 #define unusedBit_507_8_offset 1740 #define unusedBit_507_9_offset 1740 -#define unusedBitHere2_offset 1260 #define unusedFiller_4703_offset 4171 #define unusedMapAccelTaperBins_offset 1792 #define unusedShort_offset 4640 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 4c3e88a111..7ee2259fe5 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Apr 19 14:54:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Apr 20 00:07:30 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2401,7 +2401,7 @@ struct engine_configuration_s { bool useFSIO4ForSeriousEngineWarning : 1 {}; /** offset 1260 bit 29 */ - bool unusedBitHere2 : 1 {}; + bool launchActivateInverted : 1 {}; /** offset 1260 bit 30 */ bool twoStroke : 1 {}; @@ -4672,4 +4672,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21120); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Apr 19 14:54:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Apr 20 00:07:30 UTC 2022 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 3535fb6428..4db96da6f8 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1584,12 +1584,13 @@ #define lambdaRpmBins_offset 19632 #define lambdaTable_offset 19344 #define launchActivateDelay_offset 976 +#define launchActivateInverted_offset 1260 #define launchActivatePin_offset 911 #define launchActivatePinMode_offset 1747 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 #define launchActivationMode_e_auto_enum "SWITCH_INPUT_LAUNCH", "CLUTCH_INPUT_LAUNCH", "ALWAYS_ACTIVE_LAUNCH" #define launchActivationMode_e_CLUTCH_INPUT_LAUNCH 1 -#define launchActivationMode_e_enum "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +#define launchActivationMode_e_enum "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" #define launchActivationMode_e_Force_4bytes_size_launchActivationMode_e ENUM_32_BITS #define launchActivationMode_e_SWITCH_INPUT_LAUNCH 0 #define launchActivationMode_offset 940 @@ -1935,7 +1936,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 550959788 +#define SIGNATURE_HASH 3979734744 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2513,7 +2514,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.19.kin.550959788" +#define TS_SIGNATURE "rusEFI 2022.04.20.kin.3979734744" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2594,7 +2595,6 @@ #define unusedBit_507_31_offset 1740 #define unusedBit_507_8_offset 1740 #define unusedBit_507_9_offset 1740 -#define unusedBitHere2_offset 1260 #define unusedFiller_4703_offset 4143 #define unusedMapAccelTaperBins_offset 1792 #define unusedShort_offset 4612 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 68fd7ede96..89a72f5bb6 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Tue Apr 19 14:54:59 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:32 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2401,7 +2401,7 @@ struct engine_configuration_s { bool useFSIO4ForSeriousEngineWarning : 1 {}; /** offset 1260 bit 29 */ - bool unusedBitHere2 : 1 {}; + bool launchActivateInverted : 1 {}; /** offset 1260 bit 30 */ bool twoStroke : 1 {}; @@ -4678,4 +4678,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21148); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Tue Apr 19 14:54:59 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:32 UTC 2022 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 50a8013d4c..3122fcafa1 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 @@ -1577,12 +1577,13 @@ #define lambdaRpmBins_offset 19660 #define lambdaTable_offset 19372 #define launchActivateDelay_offset 976 +#define launchActivateInverted_offset 1260 #define launchActivatePin_offset 911 #define launchActivatePinMode_offset 1747 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 #define launchActivationMode_e_auto_enum "SWITCH_INPUT_LAUNCH", "CLUTCH_INPUT_LAUNCH", "ALWAYS_ACTIVE_LAUNCH" #define launchActivationMode_e_CLUTCH_INPUT_LAUNCH 1 -#define launchActivationMode_e_enum "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +#define launchActivationMode_e_enum "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" #define launchActivationMode_e_Force_4bytes_size_launchActivationMode_e ENUM_32_BITS #define launchActivationMode_e_SWITCH_INPUT_LAUNCH 0 #define launchActivationMode_offset 940 @@ -1929,7 +1930,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2217848941 +#define SIGNATURE_HASH 1238541337 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2507,7 +2508,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.04.19.subaru_eg33_f7.2217848941" +#define TS_SIGNATURE "rusEFI 2022.04.20.subaru_eg33_f7.1238541337" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2588,7 +2589,6 @@ #define unusedBit_507_31_offset 1740 #define unusedBit_507_8_offset 1740 #define unusedBit_507_9_offset 1740 -#define unusedBitHere2_offset 1260 #define unusedFiller_4703_offset 4171 #define unusedMapAccelTaperBins_offset 1792 #define unusedShort_offset 4640 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 4b8176e6ba..bb1fbdbfa7 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Apr 19 14:55:01 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:35 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2401,7 +2401,7 @@ struct engine_configuration_s { bool useFSIO4ForSeriousEngineWarning : 1 {}; /** offset 1260 bit 29 */ - bool unusedBitHere2 : 1 {}; + bool launchActivateInverted : 1 {}; /** offset 1260 bit 30 */ bool twoStroke : 1 {}; @@ -4678,4 +4678,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21148); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Apr 19 14:55:01 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:35 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index a6c2304942..b2fbcef9db 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1599,12 +1599,13 @@ #define lambdaRpmBins_offset 19660 #define lambdaTable_offset 19372 #define launchActivateDelay_offset 976 +#define launchActivateInverted_offset 1260 #define launchActivatePin_offset 911 #define launchActivatePinMode_offset 1747 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 #define launchActivationMode_e_auto_enum "SWITCH_INPUT_LAUNCH", "CLUTCH_INPUT_LAUNCH", "ALWAYS_ACTIVE_LAUNCH" #define launchActivationMode_e_CLUTCH_INPUT_LAUNCH 1 -#define launchActivationMode_e_enum "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +#define launchActivationMode_e_enum "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" #define launchActivationMode_e_Force_4bytes_size_launchActivationMode_e ENUM_32_BITS #define launchActivationMode_e_SWITCH_INPUT_LAUNCH 0 #define launchActivationMode_offset 940 @@ -1950,7 +1951,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2589947994 +#define SIGNATURE_HASH 1471966254 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2528,7 +2529,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.19.all.2589947994" +#define TS_SIGNATURE "rusEFI 2022.04.20.all.1471966254" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2609,7 +2610,6 @@ #define unusedBit_507_31_offset 1740 #define unusedBit_507_8_offset 1740 #define unusedBit_507_9_offset 1740 -#define unusedBitHere2_offset 1260 #define unusedFiller_4703_offset 4171 #define unusedMapAccelTaperBins_offset 1792 #define unusedShort_offset 4640 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 5b00474d6a..b50f6cee5e 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2589947994 -#define TS_SIGNATURE "rusEFI 2022.04.19.all.2589947994" +#define SIGNATURE_HASH 1471966254 +#define TS_SIGNATURE "rusEFI 2022.04.20.all.1471966254" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 4aa762e82c..e811a22d60 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2273092869 -#define TS_SIGNATURE "rusEFI 2022.04.19.alphax-2chan.2273092869" +#define SIGNATURE_HASH 1251979633 +#define TS_SIGNATURE "rusEFI 2022.04.20.alphax-2chan.1251979633" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 500979294c..5302d7bd9c 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 334276526 -#define TS_SIGNATURE "rusEFI 2022.04.19.alphax-4chan.334276526" +#define SIGNATURE_HASH 3725571034 +#define TS_SIGNATURE "rusEFI 2022.04.20.alphax-4chan.3725571034" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 6c3bc63e83..3ce7500d4e 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2257948029 -#define TS_SIGNATURE "rusEFI 2022.04.19.atlas.2257948029" +#define SIGNATURE_HASH 1266063625 +#define TS_SIGNATURE "rusEFI 2022.04.20.atlas.1266063625" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index b2ce136720..94273908d0 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3076583728 -#define TS_SIGNATURE "rusEFI 2022.04.19.core8.3076583728" +#define SIGNATURE_HASH 2055464260 +#define TS_SIGNATURE "rusEFI 2022.04.20.core8.2055464260" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 97855449c1..65cb76cef7 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2589947994 -#define TS_SIGNATURE "rusEFI 2022.04.19.f429-discovery.2589947994" +#define SIGNATURE_HASH 1471966254 +#define TS_SIGNATURE "rusEFI 2022.04.20.f429-discovery.1471966254" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 4bc28dcf22..0ed40a6462 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4085702763 -#define TS_SIGNATURE "rusEFI 2022.04.19.frankenso_na6.4085702763" +#define SIGNATURE_HASH 1046869023 +#define TS_SIGNATURE "rusEFI 2022.04.20.frankenso_na6.1046869023" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index e1a49fb6d3..cbdbbcf522 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3439456079 -#define TS_SIGNATURE "rusEFI 2022.04.19.harley81.3439456079" +#define SIGNATURE_HASH 14875451 +#define TS_SIGNATURE "rusEFI 2022.04.20.harley81.14875451" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index ba80dc64d2..94dea71a15 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3498439367 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen-nb1.3498439367" +#define SIGNATURE_HASH 493282995 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen-nb1.493282995" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index a2b92b58af..d5dfd351ba 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3353894436 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen121nissan.3353894436" +#define SIGNATURE_HASH 168512080 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen121nissan.168512080" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index ea58dad908..475bfe337e 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3289781197 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen121vag.3289781197" +#define SIGNATURE_HASH 167053241 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen121vag.167053241" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index f1e9ad0722..0b9e48446c 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2228059447 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen128.2228059447" +#define SIGNATURE_HASH 1227778371 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen128.1227778371" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 191a34a512..da3ca5324b 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1136290170 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen154hyundai.1136290170" +#define SIGNATURE_HASH 2388229390 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen154hyundai.2388229390" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index c121039758..31a8aca646 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2131314490 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen72.2131314490" +#define SIGNATURE_HASH 3001701198 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen72.3001701198" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a8db255ecc..441b13c3ee 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 468255964 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen81.468255964" +#define SIGNATURE_HASH 3590983848 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen81.3590983848" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 30ec59e45b..cc70f0b757 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2449641735 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen88bmw.2449641735" +#define SIGNATURE_HASH 1608615283 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen88bmw.1608615283" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 241cff23dc..65d9f0cfc4 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1056518199 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellenNA6.1056518199" +#define SIGNATURE_HASH 4078576707 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellenNA6.4078576707" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index afeecefa12..e000a5b0c8 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2531843022 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellenNA8_96.2531843022" +#define SIGNATURE_HASH 1527500730 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellenNA8_96.1527500730" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index e23da79618..82087ce8cb 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 3748869712 -#define TS_SIGNATURE "rusEFI 2022.04.19.hellen_cypress.3748869712" +#define SIGNATURE_HASH 311435812 +#define TS_SIGNATURE "rusEFI 2022.04.20.hellen_cypress.311435812" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 0f9f636897..1d03020be1 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 550959788 -#define TS_SIGNATURE "rusEFI 2022.04.19.kin.550959788" +#define SIGNATURE_HASH 3979734744 +#define TS_SIGNATURE "rusEFI 2022.04.20.kin.3979734744" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 63e2bbcccd..07b1c1bad2 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4118787633 -#define TS_SIGNATURE "rusEFI 2022.04.19.mre_f4.4118787633" +#define SIGNATURE_HASH 949789253 +#define TS_SIGNATURE "rusEFI 2022.04.20.mre_f4.949789253" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 2e0683b377..5ccc85c53d 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4118787633 -#define TS_SIGNATURE "rusEFI 2022.04.19.mre_f7.4118787633" +#define SIGNATURE_HASH 949789253 +#define TS_SIGNATURE "rusEFI 2022.04.20.mre_f7.949789253" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 686028ed59..18d91ac044 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3400901052 -#define TS_SIGNATURE "rusEFI 2022.04.19.prometheus_405.3400901052" +#define SIGNATURE_HASH 123123144 +#define TS_SIGNATURE "rusEFI 2022.04.20.prometheus_405.123123144" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 77335de645..6fc7291e9d 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3400901052 -#define TS_SIGNATURE "rusEFI 2022.04.19.prometheus_469.3400901052" +#define SIGNATURE_HASH 123123144 +#define TS_SIGNATURE "rusEFI 2022.04.20.prometheus_469.123123144" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e9183aa86c..a9cb32bc09 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3162956251 -#define TS_SIGNATURE "rusEFI 2022.04.19.proteus_f4.3162956251" +#define SIGNATURE_HASH 1902507439 +#define TS_SIGNATURE "rusEFI 2022.04.20.proteus_f4.1902507439" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index be6d3ca9e5..32b68cf1f1 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3162956251 -#define TS_SIGNATURE "rusEFI 2022.04.19.proteus_f7.3162956251" +#define SIGNATURE_HASH 1902507439 +#define TS_SIGNATURE "rusEFI 2022.04.20.proteus_f7.1902507439" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index f03efe580c..4e947bd872 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3162956251 -#define TS_SIGNATURE "rusEFI 2022.04.19.proteus_h7.3162956251" +#define SIGNATURE_HASH 1902507439 +#define TS_SIGNATURE "rusEFI 2022.04.20.proteus_h7.1902507439" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 5ac57821fa..46862217f2 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 2217848941 -#define TS_SIGNATURE "rusEFI 2022.04.19.subaru_eg33_f7.2217848941" +#define SIGNATURE_HASH 1238541337 +#define TS_SIGNATURE "rusEFI 2022.04.20.subaru_eg33_f7.1238541337" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index f3c5507a20..ea19831bb9 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1984835595 -#define TS_SIGNATURE "rusEFI 2022.04.19.tdg-pdm8.1984835595" +#define SIGNATURE_HASH 3148686463 +#define TS_SIGNATURE "rusEFI 2022.04.20.tdg-pdm8.3148686463" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 21f8e85f4b..e15355b6e7 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -522,6 +522,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->useFSIO5ForCriticalIssueEngineStop; if (strEqualCaseInsensitive(name, "useFSIO4ForSeriousEngineWarning")) return engineConfiguration->useFSIO4ForSeriousEngineWarning; + if (strEqualCaseInsensitive(name, "launchActivateInverted")) + return engineConfiguration->launchActivateInverted; if (strEqualCaseInsensitive(name, "twoStroke")) return engineConfiguration->twoStroke; if (strEqualCaseInsensitive(name, "skippedWheelOnCam")) @@ -2264,6 +2266,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->useFSIO4ForSeriousEngineWarning = (int)value; return; } + if (strEqualCaseInsensitive(name, "launchActivateInverted")) + { + engineConfiguration->launchActivateInverted = (int)value; + return; + } if (strEqualCaseInsensitive(name, "twoStroke")) { engineConfiguration->twoStroke = (int)value; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 62f6191cb0..ddd3810fcd 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.all.2589947994" + signature = "rusEFI 2022.04.20.all.1471966254" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.all.2589947994" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.all.1471966254" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:09:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:29 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5638,13 +5638,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7297,11 +7297,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 095d1877df..2195be1464 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.alphax-2chan.2273092869" + signature = "rusEFI 2022.04.20.alphax-2chan.1251979633" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.alphax-2chan.2273092869" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.alphax-2chan.1251979633" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:06:59 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","INVALID","INVALID","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5632,13 +5632,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7257,11 +7257,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 4b0d9a06d7..617e9e421f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.alphax-4chan.334276526" + signature = "rusEFI 2022.04.20.alphax-4chan.3725571034" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.alphax-4chan.334276526" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.alphax-4chan.3725571034" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:01 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5633,13 +5633,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7258,11 +7258,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index de9316ccd9..37c96a87be 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.atlas.2257948029" + signature = "rusEFI 2022.04.20.atlas.1266063625" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.atlas.2257948029" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.atlas.1266063625" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:09:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:27 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5638,13 +5638,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7288,11 +7288,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index aa22b3a18a..51acbbaf65 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.core8.3076583728" + signature = "rusEFI 2022.04.20.core8.2055464260" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.core8.3076583728" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.core8.2055464260" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:18 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","On-board Battery Sense","Grey C4 - Analog Sensor Input","Grey C5 - Analog Sensor Input","Grey C6 - Analog Sensor Input","Grey C7 - Analog Sensor Input","On-board MAP","Grey C1 - Analog Sensor Input","Grey C2 - Analog Sensor Input","On-board BARO (optional)","INVALID","Black B5 - Analog Sensor Input / Knock 2","On-board O2","On-board O2(Secondary)","INVALID","Grey C3 - Analog Sensor Input","Black C6 - Analog Sensor Input / Knock 1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5635,13 +5635,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7288,11 +7288,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index d54090e8d6..bc5d987dd5 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.f429-discovery.2589947994" + signature = "rusEFI 2022.04.20.f429-discovery.1471966254" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.f429-discovery.2589947994" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.f429-discovery.1471966254" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:09:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:26 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5638,13 +5638,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7297,11 +7297,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index a9b6e9403c..4f144ff085 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.frankenso_na6.4085702763" + signature = "rusEFI 2022.04.20.frankenso_na6.1046869023" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.frankenso_na6.4085702763" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.frankenso_na6.1046869023" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:19 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5638,13 +5638,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7297,11 +7297,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 6bc29fb472..af865e1632 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.harley81.3439456079" + signature = "rusEFI 2022.04.20.harley81.14875451" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.harley81.3439456079" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.harley81.14875451" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:02 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","INVALID","27 - TPS 2","INVALID","INVALID","52 - TPS 1","5 Battery Sense","INVALID","INVALID","41 - PPS 1","INVALID","53 - MAP","INVALID","49 CLT","72 IAT","32 Oil Pressure","34 Kickstand Position Sensor", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7261,11 +7261,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index bfe66e47d1..3a3eee6bd0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen-nb1.3498439367" + signature = "rusEFI 2022.04.20.hellen-nb1.493282995" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen-nb1.3498439367" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen-nb1.493282995" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:12 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7259,11 +7259,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 1331bed302..b864a7f934 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen121nissan.3353894436" + signature = "rusEFI 2022.04.20.hellen121nissan.168512080" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen121nissan.3353894436" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen121nissan.168512080" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:06 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","INVALID","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7260,11 +7260,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 358dcddd83..c6e663fb53 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen121vag.3289781197" + signature = "rusEFI 2022.04.20.hellen121vag.167053241" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen121vag.3289781197" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen121vag.167053241" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:04 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7262,11 +7262,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 9e1f0d41f9..fbe1c8f3e6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen128.2228059447" + signature = "rusEFI 2022.04.20.hellen128.1227778371" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen128.2228059447" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen128.1227778371" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:03 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7260,11 +7260,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index dd73d4e547..0c3bcc135f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen154hyundai.1136290170" + signature = "rusEFI 2022.04.20.hellen154hyundai.2388229390" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen154hyundai.1136290170" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen154hyundai.2388229390" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:07 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","K21 Ambient Temperature","K58 Oil Temp","INVALID","PPS 1","TPS 1","K2 Ignition Key Voltage","INVALID","INVALID","TPS 2","INVALID","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7259,11 +7259,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 5fe78d4438..85674607a1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen72.2131314490" + signature = "rusEFI 2022.04.20.hellen72.3001701198" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen72.2131314490" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen72.3001701198" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:09 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","4W - O2S (A13)","3L - IGN_7 / AFR","intMAP (A15)","4C - Steering/RES2 (A16)","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","4H - Neutral/AUX2 (A21)","4AE - EGR/MAP4 (A22)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7259,11 +7259,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index ba041c1081..a710ac0007 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen81.468255964" + signature = "rusEFI 2022.04.20.hellen81.3590983848" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen81.468255964" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen81.3590983848" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:10 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5633,13 +5633,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7256,11 +7256,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index d4ff866ed4..41ef9f2c83 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen88bmw.2449641735" + signature = "rusEFI 2022.04.20.hellen88bmw.1608615283" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen88bmw.2449641735" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen88bmw.1608615283" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:08 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","INVALID","INVALID","INVALID","INVALID","73 - TPS","INVALID","17 - CAM","Aux BARO","INVALID","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7257,11 +7257,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index af1df73fb9..96e7bdad0a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellenNA6.1056518199" + signature = "rusEFI 2022.04.20.hellenNA6.4078576707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellenNA6.1056518199" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellenNA6.4078576707" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:13 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","INVALID","TPS Input","1B - Battery Sense","INVALID","INVALID","INVALID","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7260,11 +7260,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 160ff2ae98..097f625122 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellenNA8_96.2531843022" + signature = "rusEFI 2022.04.20.hellenNA8_96.1527500730" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellenNA8_96.2531843022" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellenNA8_96.1527500730" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:14 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7259,11 +7259,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 99b7967a3a..d7745f48a5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.hellen_cypress.3748869712" + signature = "rusEFI 2022.04.20.hellen_cypress.311435812" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.hellen_cypress.3748869712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.hellen_cypress.311435812" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:09:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Apr 20 00:07:31 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5638,13 +5638,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7297,11 +7297,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 4ee4259c13..2e488c5fce 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.kin.550959788" + signature = "rusEFI 2022.04.20.kin.3979734744" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.kin.550959788" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.kin.3979734744" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:09:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Apr 20 00:07:30 UTC 2022 pageSize = 21120 page = 1 @@ -547,7 +547,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -654,7 +654,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5598,13 +5598,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7257,11 +7257,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d8a0821e1f..28f4e5930a 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.mre_f4.4118787633" + signature = "rusEFI 2022.04.20.mre_f4.949789253" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.mre_f4.4118787633" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.mre_f4.949789253" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:16 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5635,13 +5635,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7265,11 +7265,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index c12b6a507f..91295e39f1 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.mre_f7.4118787633" + signature = "rusEFI 2022.04.20.mre_f7.949789253" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.mre_f7.4118787633" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.mre_f7.949789253" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:15 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5635,13 +5635,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7265,11 +7265,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index dd11ef51d4..c63955a420 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.prometheus_405.3400901052" + signature = "rusEFI 2022.04.20.prometheus_405.123123144" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.prometheus_405.3400901052" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.prometheus_405.123123144" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:21 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5633,13 +5633,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7292,11 +7292,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 0529996a3b..15f7cdd733 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.prometheus_469.3400901052" + signature = "rusEFI 2022.04.20.prometheus_469.123123144" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.prometheus_469.3400901052" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.prometheus_469.123123144" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:20 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5633,13 +5633,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7292,11 +7292,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 3791e3fb06..1f527425bf 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.proteus_f4.3162956251" + signature = "rusEFI 2022.04.20.proteus_f4.1902507439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.proteus_f4.3162956251" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.proteus_f4.1902507439" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:23 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5631,13 +5631,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7257,11 +7257,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 472fc8a011..7601b98de0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.proteus_f7.3162956251" + signature = "rusEFI 2022.04.20.proteus_f7.1902507439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.proteus_f7.3162956251" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.proteus_f7.1902507439" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:08:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:22 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5631,13 +5631,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7257,11 +7257,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 71f14b6fc8..f3313a9e56 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.proteus_h7.3162956251" + signature = "rusEFI 2022.04.20.proteus_h7.1902507439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.proteus_h7.3162956251" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.proteus_h7.1902507439" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:09:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:25 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5631,13 +5631,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7257,11 +7257,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 2d245b0bc3..0d8cb2013f 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.subaru_eg33_f7.2217848941" + signature = "rusEFI 2022.04.20.subaru_eg33_f7.1238541337" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.subaru_eg33_f7.2217848941" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.subaru_eg33_f7.1238541337" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:09:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:32 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5634,13 +5634,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7281,11 +7281,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 6696f18ceb..0f1da07ab8 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.19.tdg-pdm8.1984835595" + signature = "rusEFI 2022.04.20.tdg-pdm8.3148686463" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.19.tdg-pdm8.1984835595" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.20.tdg-pdm8.3148686463" ; 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 @@ -84,7 +84,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 Tue Apr 19 19:09:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:28 UTC 2022 pageSize = 21148 page = 1 @@ -550,7 +550,7 @@ boostPid_minValue = scalar, S16, 928, "", 1, 0, -30000, 30000, 0 boostPid_maxValue = scalar, S16, 930, "", 1, 0, -30000, 30000, 0 boostType = bits, U32, 932, [0:0], "Open Loop", "Closed Loop" boostPwmFrequency = scalar, S32, 936, "Hz", 1, 0, 0, 3000, 0 -launchActivationMode = bits, S32, 940, [0:1], "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID" +launchActivationMode = bits, S32, 940, [0:1], "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID" antiLagActivationMode = bits, S32, 944, [0:0], "Always Active", "Switch Input" launchSpeedThreshold = scalar, S32, 948, "Kph", 1, 0, 0, 300, 0 launchTimingRpmRange = scalar, S32, 952, "RPM", 1, 0, 0, 8000, 0 @@ -660,7 +660,7 @@ boardUseD4PullDown = bits, U32, 1260, [25:25], "With Pull Up", "With Pull Down" boardUseD5PullDown = bits, U32, 1260, [26:26], "With Pull Up", "With Pull Down" useFSIO5ForCriticalIssueEngineStop = bits, U32, 1260, [27:27], "false", "true" useFSIO4ForSeriousEngineWarning = bits, U32, 1260, [28:28], "false", "true" -unusedBitHere2 = bits, U32, 1260, [29:29], "false", "true" +launchActivateInverted = bits, U32, 1260, [29:29], "false", "true" twoStroke = bits, U32, 1260, [30:30], "Four Stroke", "Two Stroke" skippedWheelOnCam = bits, U32, 1260, [31:31], "On crankshaft", "On camshaft" hipOutputChannel = bits, U08, 1264, [0:5], "NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5638,13 +5638,13 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" - field = "Clutch down switch", clutchDownPin - field = "Clutch down inverted", clutchDownPinInverted - field = "Clutch down mode", clutchDownPinMode + field = "Clutch Down", clutchDownPin + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode - field = "Clutch up switch", clutchUpPin - field = "Clutch up inverted", clutchUpPinInverted - field = "Clutch up mode", clutchUpPinMode + field = "Clutch Up", clutchUpPin + field = "Clutch Up inverted", clutchUpPinInverted + field = "Clutch Up mode", clutchUpPinMode field = "Throttle Up switch", throttlePedalUpPin field = "Brake pedal switch", brakePedalPin field = "Flex fuel sensor", flexSensorPin @@ -7297,11 +7297,16 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} - field = "Clutch Input", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} - field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} + + field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button inverted", launchActivateInverted + field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} + + field = "Clutch Down", clutchDownPin, {launchActivationMode == 1 && launchControlEnabled == 1} + field = "Clutch Down inverted", clutchDownPinInverted + field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == 1 && launchControlEnabled == 1} field = "" + ; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1} field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1} field = "" 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 4e6b435204..0036cf5315 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 Tue Apr 19 18:38:55 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:35 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1549,6 +1549,7 @@ public class Fields { public static final int lambdaRpmBins_offset = 19660; public static final int lambdaTable_offset = 19372; public static final int launchActivateDelay_offset = 976; + public static final int launchActivateInverted_offset = 1260; public static final int launchActivatePin_offset = 911; public static final int launchActivatePinMode_offset = 1747; public static final int launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH = 2; @@ -1876,6 +1877,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2738; public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; + public static final int SIGNATURE_HASH = 1471966254; public static final int silentTriggerError_offset = 1260; public static final int skippedWheelOnCam_offset = 1260; public static final int slowAdcAlpha_offset = 1712; @@ -2391,7 +2393,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.04.19.all.2589947994"; + public static final String TS_SIGNATURE = "rusEFI 2022.04.20.all.1471966254"; 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 = 1000; @@ -2469,7 +2471,6 @@ public class Fields { public static final int unusedBit_507_31_offset = 1740; public static final int unusedBit_507_8_offset = 1740; public static final int unusedBit_507_9_offset = 1740; - public static final int unusedBitHere2_offset = 1260; public static final int unusedFiller_4703_offset = 4171; public static final int unusedMapAccelTaperBins_offset = 1792; public static final int unusedShort_offset = 4640; @@ -3069,7 +3070,7 @@ public class Fields { public static final Field BOOSTPID_MAXVALUE = Field.create("BOOSTPID_MAXVALUE", 930, FieldType.INT16).setScale(1.0); public static final Field BOOSTTYPE = Field.create("BOOSTTYPE", 932, FieldType.INT).setScale(1.0); public static final Field BOOSTPWMFREQUENCY = Field.create("BOOSTPWMFREQUENCY", 936, FieldType.INT).setScale(1.0); - public static final String[] launchActivationMode_e = {"Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID"}; + public static final String[] launchActivationMode_e = {"Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID"}; public static final Field LAUNCHACTIVATIONMODE = Field.create("LAUNCHACTIVATIONMODE", 940, FieldType.INT, launchActivationMode_e).setScale(1.0); public static final String[] antiLagActivationMode_e = {"Always Active", "Switch Input"}; public static final Field ANTILAGACTIVATIONMODE = Field.create("ANTILAGACTIVATIONMODE", 944, FieldType.INT, antiLagActivationMode_e).setScale(1.0); @@ -3181,7 +3182,7 @@ public class Fields { public static final Field BOARDUSED5PULLDOWN = Field.create("BOARDUSED5PULLDOWN", 1260, FieldType.BIT, 26); public static final Field USEFSIO5FORCRITICALISSUEENGINESTOP = Field.create("USEFSIO5FORCRITICALISSUEENGINESTOP", 1260, FieldType.BIT, 27); public static final Field USEFSIO4FORSERIOUSENGINEWARNING = Field.create("USEFSIO4FORSERIOUSENGINEWARNING", 1260, FieldType.BIT, 28); - public static final Field UNUSEDBITHERE2 = Field.create("UNUSEDBITHERE2", 1260, FieldType.BIT, 29); + public static final Field LAUNCHACTIVATEINVERTED = Field.create("LAUNCHACTIVATEINVERTED", 1260, FieldType.BIT, 29); public static final Field TWOSTROKE = Field.create("TWOSTROKE", 1260, FieldType.BIT, 30); public static final Field SKIPPEDWHEELONCAM = Field.create("SKIPPEDWHEELONCAM", 1260, FieldType.BIT, 31); public static final Field HIPOUTPUTCHANNEL = Field.create("HIPOUTPUTCHANNEL", 1264, FieldType.INT8, adc_channel_e).setScale(1.0); @@ -4526,7 +4527,7 @@ public class Fields { BOARDUSED5PULLDOWN, USEFSIO5FORCRITICALISSUEENGINESTOP, USEFSIO4FORSERIOUSENGINEWARNING, - UNUSEDBITHERE2, + LAUNCHACTIVATEINVERTED, TWOSTROKE, SKIPPEDWHEELONCAM, HIPOUTPUTCHANNEL,