From 9ec7897e37158705d82fd35da3c377dd685845e1 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 22 Dec 2021 16:08:59 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../algo/engine_configuration_generated_structures.h | 6 +++--- .../config/controllers/algo/rusefi_generated.h | 6 +++--- .../algo/engine_configuration_generated_structures.h | 6 +++--- .../config/controllers/algo/rusefi_generated.h | 6 +++--- .../algo/engine_configuration_generated_structures.h | 6 +++--- .../config/controllers/algo/rusefi_generated.h | 6 +++--- .../engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/generated/rusefi_generated.h | 6 +++--- firmware/controllers/generated/signature_all.h | 4 ++-- firmware/controllers/generated/signature_atlas.h | 4 ++-- .../controllers/generated/signature_f429-discovery.h | 4 ++-- .../controllers/generated/signature_frankenso_na6.h | 4 ++-- firmware/controllers/generated/signature_hellen-nb1.h | 4 ++-- .../controllers/generated/signature_hellen121nissan.h | 4 ++-- .../controllers/generated/signature_hellen121vag.h | 4 ++-- firmware/controllers/generated/signature_hellen128.h | 4 ++-- .../generated/signature_hellen154hyundai.h | 4 ++-- firmware/controllers/generated/signature_hellen72.h | 4 ++-- firmware/controllers/generated/signature_hellen81.h | 4 ++-- .../controllers/generated/signature_hellen88bmw.h | 4 ++-- firmware/controllers/generated/signature_hellenNA6.h | 4 ++-- .../controllers/generated/signature_hellen_cypress.h | 4 ++-- firmware/controllers/generated/signature_kin.h | 4 ++-- firmware/controllers/generated/signature_mre_f4.h | 4 ++-- firmware/controllers/generated/signature_mre_f7.h | 4 ++-- .../controllers/generated/signature_prometheus_405.h | 4 ++-- .../controllers/generated/signature_prometheus_469.h | 4 ++-- firmware/controllers/generated/signature_proteus_f4.h | 4 ++-- firmware/controllers/generated/signature_proteus_f7.h | 4 ++-- .../controllers/generated/signature_subaru_eg33_f7.h | 4 ++-- .../lua/generated/value_lookup_generated.cpp | 7 +++++++ firmware/tunerstudio/generated/rusefi.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_atlas.ini | 9 +++++---- .../tunerstudio/generated/rusefi_f429-discovery.ini | 9 +++++---- .../tunerstudio/generated/rusefi_frankenso_na6.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_hellen-nb1.ini | 9 +++++---- .../tunerstudio/generated/rusefi_hellen121nissan.ini | 9 +++++---- .../tunerstudio/generated/rusefi_hellen121vag.ini | 9 +++++---- .../generated/rusefi_hellen128mercedes.ini | 9 +++++---- .../tunerstudio/generated/rusefi_hellen154hyundai.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_hellen72.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_hellen81.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_hellen88bmw.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_hellenNA6.ini | 9 +++++---- .../tunerstudio/generated/rusefi_hellen_cypress.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_kinetis.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_mre_f4.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_mre_f7.ini | 9 +++++---- .../tunerstudio/generated/rusefi_prometheus_405.ini | 9 +++++---- .../tunerstudio/generated/rusefi_prometheus_469.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_proteus_f4.ini | 9 +++++---- firmware/tunerstudio/generated/rusefi_proteus_f7.ini | 9 +++++---- .../tunerstudio/generated/rusefi_subaru_eg33_f7.ini | 9 +++++---- .../main/java/com/rusefi/config/generated/Fields.java | 11 +++++------ 54 files changed, 190 insertions(+), 162 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 cbabe0378d..486a24b2de 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 Wed Dec 22 13:13:49 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Dec 22 16:07:30 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2113,7 +2113,7 @@ struct engine_configuration_s { bool tcuEnabled : 1 {}; /** offset 896 bit 29 */ - bool unusedBit_251_29 : 1 {}; + bool canBroadcastUseChannelTwo : 1 {}; /** offset 896 bit 30 */ bool unusedBit_310_30 : 1 {}; @@ -4417,4 +4417,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Dec 22 13:13:49 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Dec 22 16:07:30 UTC 2021 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 bd9da1db8a..65005334db 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 @@ -480,6 +480,7 @@ #define can_vss_nbc_e_Force_4_bytes_size_can_vss_nbc_e ENUM_32_BITS #define can_vss_nbc_e_W202 1 #define canBaudRate_offset 1732 +#define canBroadcastUseChannelTwo_offset 896 #define canNbcType_offset 492 #define canReadEnabled_offset 1260 #define canRxPin_offset 717 @@ -1874,7 +1875,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 1012670280 +#define SIGNATURE_HASH 3258499318 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2394,7 +2395,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen_cypress.1012670280" +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen_cypress.3258499318" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2434,7 +2435,6 @@ #define unused_1484_bit_30_offset 1272 #define unused_1484_bit_31_offset 1272 #define unusedBit4_1476_offset 1272 -#define unusedBit_251_29_offset 896 #define unusedBit_310_30_offset 896 #define unusedBit_310_31_offset 896 #define unusedBit_48_31_offset 164 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 c1ba4a5818..63d593636e 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 Wed Dec 22 13:13:47 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Dec 22 16:07:28 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2113,7 +2113,7 @@ struct engine_configuration_s { bool tcuEnabled : 1 {}; /** offset 896 bit 29 */ - bool unusedBit_251_29 : 1 {}; + bool canBroadcastUseChannelTwo : 1 {}; /** offset 896 bit 30 */ bool unusedBit_310_30 : 1 {}; @@ -4411,4 +4411,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Dec 22 13:13:47 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Dec 22 16:07:28 UTC 2021 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 bc4e0793fb..45a32db810 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -465,6 +465,7 @@ #define can_vss_nbc_e_Force_4_bytes_size_can_vss_nbc_e ENUM_32_BITS #define can_vss_nbc_e_W202 1 #define canBaudRate_offset 1732 +#define canBroadcastUseChannelTwo_offset 896 #define canNbcType_offset 492 #define canReadEnabled_offset 1260 #define canRxPin_offset 717 @@ -1859,7 +1860,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3287929780 +#define SIGNATURE_HASH 1033702410 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2379,7 +2380,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.22.kin.3287929780" +#define TS_SIGNATURE "rusEFI 2021.12.22.kin.1033702410" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2419,7 +2420,6 @@ #define unused_1484_bit_30_offset 1272 #define unused_1484_bit_31_offset 1272 #define unusedBit4_1476_offset 1272 -#define unusedBit_251_29_offset 896 #define unusedBit_310_30_offset 896 #define unusedBit_310_31_offset 896 #define unusedBit_48_31_offset 164 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 0fd4d7f1af..63cb6d5c62 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_config.sh integration/rusefi_config.txt Wed Dec 22 13:13:51 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:33 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2113,7 +2113,7 @@ struct engine_configuration_s { bool tcuEnabled : 1 {}; /** offset 896 bit 29 */ - bool unusedBit_251_29 : 1 {}; + bool canBroadcastUseChannelTwo : 1 {}; /** offset 896 bit 30 */ bool unusedBit_310_30 : 1 {}; @@ -4417,4 +4417,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Dec 22 13:13:51 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:33 UTC 2021 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 75c6782aed..b702d86774 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 @@ -492,6 +492,7 @@ #define can_vss_nbc_e_Force_4_bytes_size_can_vss_nbc_e ENUM_32_BITS #define can_vss_nbc_e_W202 1 #define canBaudRate_offset 1732 +#define canBroadcastUseChannelTwo_offset 896 #define canNbcType_offset 492 #define canReadEnabled_offset 1260 #define canRxPin_offset 717 @@ -1887,7 +1888,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3306417828 +#define SIGNATURE_HASH 997667098 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2407,7 +2408,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.12.22.subaru_eg33_f7.3306417828" +#define TS_SIGNATURE "rusEFI 2021.12.22.subaru_eg33_f7.997667098" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2447,7 +2448,6 @@ #define unused_1484_bit_30_offset 1272 #define unused_1484_bit_31_offset 1272 #define unusedBit4_1476_offset 1272 -#define unusedBit_251_29_offset 896 #define unusedBit_310_30_offset 896 #define unusedBit_310_31_offset 896 #define unusedBit_48_31_offset 164 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index ad98b68b3b..345d4a55a2 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 Wed Dec 22 13:13:54 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:37 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2113,7 +2113,7 @@ struct engine_configuration_s { bool tcuEnabled : 1 {}; /** offset 896 bit 29 */ - bool unusedBit_251_29 : 1 {}; + bool canBroadcastUseChannelTwo : 1 {}; /** offset 896 bit 30 */ bool unusedBit_310_30 : 1 {}; @@ -4417,4 +4417,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 13:13:54 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:37 UTC 2021 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 7951815fcb..11a4700747 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -480,6 +480,7 @@ #define can_vss_nbc_e_Force_4_bytes_size_can_vss_nbc_e ENUM_32_BITS #define can_vss_nbc_e_W202 1 #define canBaudRate_offset 1732 +#define canBroadcastUseChannelTwo_offset 896 #define canNbcType_offset 492 #define canReadEnabled_offset 1260 #define canRxPin_offset 717 @@ -1874,7 +1875,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 111802612 +#define SIGNATURE_HASH 4174194506 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -2394,7 +2395,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.22.all.111802612" +#define TS_SIGNATURE "rusEFI 2021.12.22.all.4174194506" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2434,7 +2435,6 @@ #define unused_1484_bit_30_offset 1272 #define unused_1484_bit_31_offset 1272 #define unusedBit4_1476_offset 1272 -#define unusedBit_251_29_offset 896 #define unusedBit_310_30_offset 896 #define unusedBit_310_31_offset 896 #define unusedBit_48_31_offset 164 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index a0af60d74c..8c31e5c6b7 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 111802612 -#define TS_SIGNATURE "rusEFI 2021.12.22.all.111802612" +#define SIGNATURE_HASH 4174194506 +#define TS_SIGNATURE "rusEFI 2021.12.22.all.4174194506" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 9a494cab3e..83d3b55a08 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 442699219 -#define TS_SIGNATURE "rusEFI 2021.12.22.atlas.442699219" +#define SIGNATURE_HASH 3825717869 +#define TS_SIGNATURE "rusEFI 2021.12.22.atlas.3825717869" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 18e61fc1e6..fc109fbb7f 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 111802612 -#define TS_SIGNATURE "rusEFI 2021.12.22.f429-discovery.111802612" +#define SIGNATURE_HASH 4174194506 +#define TS_SIGNATURE "rusEFI 2021.12.22.f429-discovery.4174194506" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index a0c495b5f9..57f4d9963f 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 2090577181 -#define TS_SIGNATURE "rusEFI 2021.12.22.frankenso_na6.2090577181" +#define SIGNATURE_HASH 2197779107 +#define TS_SIGNATURE "rusEFI 2021.12.22.frankenso_na6.2197779107" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index fe5685e877..5e34b85411 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 2742798461 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen-nb1.2742798461" +#define SIGNATURE_HASH 1562318787 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen-nb1.1562318787" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 8fb1967c9c..2c89732272 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 3173882453 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen121nissan.3173882453" +#define SIGNATURE_HASH 1128875499 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen121nissan.1128875499" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index c8141d37ef..7f33b53b8a 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 1493884158 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen121vag.1493884158" +#define SIGNATURE_HASH 2809004864 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen121vag.2809004864" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 3ff398d635..faf71cc050 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 2624557907 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen128.2624557907" +#define SIGNATURE_HASH 1644907757 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen128.1644907757" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 2527ff0667..398cdb251f 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 3400918104 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen154hyundai.3400918104" +#define SIGNATURE_HASH 886127590 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen154hyundai.886127590" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index c01f3f6e24..4bcfec5fbb 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 4061429572 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen72.4061429572" +#define SIGNATURE_HASH 208707834 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen72.208707834" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 3a948c7e0e..f195eb12fd 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 1176101559 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen81.1176101559" +#define SIGNATURE_HASH 3095215369 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen81.3095215369" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index ffc33aca91..a3c5b5a7d2 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 2808703403 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen88bmw.2808703403" +#define SIGNATURE_HASH 1494070805 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen88bmw.1494070805" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 6b8f96cda2..76ea53851c 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 1888796252 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellenNA6.1888796252" +#define SIGNATURE_HASH 2398118370 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellenNA6.2398118370" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index fd4ceb7e79..b4636484bc 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 1012670280 -#define TS_SIGNATURE "rusEFI 2021.12.22.hellen_cypress.1012670280" +#define SIGNATURE_HASH 3258499318 +#define TS_SIGNATURE "rusEFI 2021.12.22.hellen_cypress.3258499318" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 32a8b3572d..ede42427c3 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 3287929780 -#define TS_SIGNATURE "rusEFI 2021.12.22.kin.3287929780" +#define SIGNATURE_HASH 1033702410 +#define TS_SIGNATURE "rusEFI 2021.12.22.kin.1033702410" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index caa46af00c..fc5d97da62 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 3046015552 -#define TS_SIGNATURE "rusEFI 2021.12.22.mre_f4.3046015552" +#define SIGNATURE_HASH 1273650686 +#define TS_SIGNATURE "rusEFI 2021.12.22.mre_f4.1273650686" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 4723e5d0a0..8558d70cf0 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 3046015552 -#define TS_SIGNATURE "rusEFI 2021.12.22.mre_f7.3046015552" +#define SIGNATURE_HASH 1273650686 +#define TS_SIGNATURE "rusEFI 2021.12.22.mre_f7.1273650686" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 253dec3943..1da4c2c932 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 1447239954 -#define TS_SIGNATURE "rusEFI 2021.12.22.prometheus_405.1447239954" +#define SIGNATURE_HASH 2821193388 +#define TS_SIGNATURE "rusEFI 2021.12.22.prometheus_405.2821193388" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a995e0cfc9..0c942c1476 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 1447239954 -#define TS_SIGNATURE "rusEFI 2021.12.22.prometheus_469.1447239954" +#define SIGNATURE_HASH 2821193388 +#define TS_SIGNATURE "rusEFI 2021.12.22.prometheus_469.2821193388" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 1ab8e022dc..b0b3cbd19b 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 3130524507 -#define TS_SIGNATURE "rusEFI 2021.12.22.proteus_f4.3130524507" +#define SIGNATURE_HASH 1157422309 +#define TS_SIGNATURE "rusEFI 2021.12.22.proteus_f4.1157422309" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 93ca05b345..15d631d20f 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 integration/rusefi_config.txt // -#define SIGNATURE_HASH 3130524507 -#define TS_SIGNATURE "rusEFI 2021.12.22.proteus_f7.3130524507" +#define SIGNATURE_HASH 1157422309 +#define TS_SIGNATURE "rusEFI 2021.12.22.proteus_f7.1157422309" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index a8c6df9a4e..1894f0f22e 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_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3306417828 -#define TS_SIGNATURE "rusEFI 2021.12.22.subaru_eg33_f7.3306417828" +#define SIGNATURE_HASH 997667098 +#define TS_SIGNATURE "rusEFI 2021.12.22.subaru_eg33_f7.997667098" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 38c6e299bf..ed49345d10 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -410,6 +410,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->knockBankCyl12; if (strEqualCaseInsensitive(name, "tcuEnabled")) return engineConfiguration->tcuEnabled; + if (strEqualCaseInsensitive(name, "canBroadcastUseChannelTwo")) + return engineConfiguration->canBroadcastUseChannelTwo; if (strEqualCaseInsensitive(name, "boostPid.pFactor")) return engineConfiguration->boostPid.pFactor; if (strEqualCaseInsensitive(name, "boostPid.iFactor")) @@ -1922,6 +1924,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->tcuEnabled = (int)value; return; } + if (strEqualCaseInsensitive(name, "canBroadcastUseChannelTwo")) + { + engineConfiguration->canBroadcastUseChannelTwo = (int)value; + return; + } if (strEqualCaseInsensitive(name, "boostPid.pFactor")) { engineConfiguration->boostPid.pFactor = value; diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 3fd3bc570c..7091ff3550 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 2021.12.22.all.111802612" + signature = "rusEFI 2021.12.22.all.4174194506" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.all.111802612" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.all.4174194506" ; 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 Wed Dec 22 13:13:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:26 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5446,6 +5446,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 4265cf66de..6c3715f5ab 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 2021.12.22.atlas.442699219" + signature = "rusEFI 2021.12.22.atlas.3825717869" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.atlas.442699219" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.atlas.3825717869" ; 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 Wed Dec 22 13:13:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:24 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5438,6 +5438,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index ce2c287a37..0d7ca88cfa 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 2021.12.22.f429-discovery.111802612" + signature = "rusEFI 2021.12.22.f429-discovery.4174194506" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.f429-discovery.111802612" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.f429-discovery.4174194506" ; 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 Wed Dec 22 13:12:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:06:43 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5446,6 +5446,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index e96f29c8d7..f99d440681 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 2021.12.22.frankenso_na6.2090577181" + signature = "rusEFI 2021.12.22.frankenso_na6.2197779107" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.frankenso_na6.2090577181" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.frankenso_na6.2197779107" ; 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 Wed Dec 22 13:13:30 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:12 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5446,6 +5446,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 6741180358..0b831612ba 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 2021.12.22.hellen-nb1.2742798461" + signature = "rusEFI 2021.12.22.hellen-nb1.1562318787" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen-nb1.2742798461" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen-nb1.1562318787" ; 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 Wed Dec 22 13:13:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:02 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 631f7e5d88..0494e1ed26 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 2021.12.22.hellen121nissan.3173882453" + signature = "rusEFI 2021.12.22.hellen121nissan.1128875499" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen121nissan.3173882453" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen121nissan.1128875499" ; 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 Wed Dec 22 13:13:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:06:50 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index be09a6df4c..0bd7473b73 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 2021.12.22.hellen121vag.1493884158" + signature = "rusEFI 2021.12.22.hellen121vag.2809004864" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen121vag.1493884158" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen121vag.2809004864" ; 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 Wed Dec 22 13:13:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:06:48 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 7de70d3508..03067093e0 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 2021.12.22.hellen128.2624557907" + signature = "rusEFI 2021.12.22.hellen128.1644907757" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen128.2624557907" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen128.1644907757" ; 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 Wed Dec 22 13:13:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:06:46 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index f3acff3e67..aeb8d7da2e 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 2021.12.22.hellen154hyundai.3400918104" + signature = "rusEFI 2021.12.22.hellen154hyundai.886127590" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen154hyundai.3400918104" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen154hyundai.886127590" ; 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 Wed Dec 22 13:13:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:06:53 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 897fa32356..9e4a0efe4f 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 2021.12.22.hellen72.4061429572" + signature = "rusEFI 2021.12.22.hellen72.208707834" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen72.4061429572" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen72.208707834" ; 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 Wed Dec 22 13:13:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:06:58 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index dee4bb4b72..44eb3e8554 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 2021.12.22.hellen81.1176101559" + signature = "rusEFI 2021.12.22.hellen81.3095215369" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen81.1176101559" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen81.3095215369" ; 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 Wed Dec 22 13:13:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:00 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5428,6 +5428,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index e6f10bd906..c3f202e4b3 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 2021.12.22.hellen88bmw.2808703403" + signature = "rusEFI 2021.12.22.hellen88bmw.1494070805" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen88bmw.2808703403" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen88bmw.1494070805" ; 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 Wed Dec 22 13:13:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:06:55 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 5b12d35be7..f3eb24c4be 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 2021.12.22.hellenNA6.1888796252" + signature = "rusEFI 2021.12.22.hellenNA6.2398118370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellenNA6.1888796252" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellenNA6.2398118370" ; 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 Wed Dec 22 13:13:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:05 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 6730980f4c..bf1c8c0be7 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 2021.12.22.hellen_cypress.1012670280" + signature = "rusEFI 2021.12.22.hellen_cypress.3258499318" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.hellen_cypress.1012670280" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.hellen_cypress.3258499318" ; 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 Wed Dec 22 13:13:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Dec 22 16:07:30 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5446,6 +5446,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index e40e29fa1f..c230918b56 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 2021.12.22.kin.3287929780" + signature = "rusEFI 2021.12.22.kin.1033702410" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.kin.3287929780" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.kin.1033702410" ; 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 Wed Dec 22 13:13:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Dec 22 16:07:28 UTC 2021 pageSize = 20968 page = 1 @@ -522,7 +522,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5413,6 +5413,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index c4eb284922..62fc88a2fb 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 2021.12.22.mre_f4.3046015552" + signature = "rusEFI 2021.12.22.mre_f4.1273650686" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.mre_f4.3046015552" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.mre_f4.1273650686" ; 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 Wed Dec 22 13:13:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:09 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 4482d4c423..8f5c8a8b23 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 2021.12.22.mre_f7.3046015552" + signature = "rusEFI 2021.12.22.mre_f7.1273650686" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.mre_f7.3046015552" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.mre_f7.1273650686" ; 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 Wed Dec 22 13:13:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:07 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5429,6 +5429,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index eed526f193..33fc1a8d33 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 2021.12.22.prometheus_405.1447239954" + signature = "rusEFI 2021.12.22.prometheus_405.2821193388" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.prometheus_405.1447239954" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.prometheus_405.2821193388" ; 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 Wed Dec 22 13:13:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:17 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5441,6 +5441,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index a280cd809c..329c9654ae 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 2021.12.22.prometheus_469.1447239954" + signature = "rusEFI 2021.12.22.prometheus_469.2821193388" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.prometheus_469.1447239954" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.prometheus_469.2821193388" ; 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 Wed Dec 22 13:13:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:14 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5441,6 +5441,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d2787e50ba..bfcddcccb6 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 2021.12.22.proteus_f4.3130524507" + signature = "rusEFI 2021.12.22.proteus_f4.1157422309" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.proteus_f4.3130524507" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.proteus_f4.1157422309" ; 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 Wed Dec 22 13:13:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:21 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5423,6 +5423,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 28bf5f6f67..eb42cffe06 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 2021.12.22.proteus_f7.3130524507" + signature = "rusEFI 2021.12.22.proteus_f7.1157422309" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.proteus_f7.3130524507" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.proteus_f7.1157422309" ; 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 Wed Dec 22 13:13:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:19 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5423,6 +5423,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 575ec8ce77..4673b60430 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 2021.12.22.subaru_eg33_f7.3306417828" + signature = "rusEFI 2021.12.22.subaru_eg33_f7.997667098" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.22.subaru_eg33_f7.3306417828" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.22.subaru_eg33_f7.997667098" ; 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_config.sh integration/rusefi_config.txt Wed Dec 22 13:13:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:33 UTC 2021 pageSize = 20996 page = 1 @@ -525,7 +525,7 @@ knockBankCyl10 = bits, U32, 896, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 896, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 896, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 896, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 896, [29:29], "false", "true" +canBroadcastUseChannelTwo = bits, U32, 896, [29:29], "first", "second" unusedBit_310_30 = bits, U32, 896, [30:30], "false", "true" unusedBit_310_31 = bits, U32, 896, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 900, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5439,6 +5439,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "Which CAN channel to broadcast on", canBroadcastUseChannelTwo field = "rusEFI CAN data base address", verboseCanBaseAddress field = "rusEFI CAN data address type", rusefiVerbose29b field = "rusEFI CAN data period", canSleepPeriodMs 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 3dd9b8f69d..5a49c7c02d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 13:13:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Dec 22 16:07:37 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -462,6 +462,7 @@ public class Fields { public static final int can_vss_nbc_e_BMW_e46 = 0; public static final int can_vss_nbc_e_W202 = 1; public static final int canBaudRate_offset = 1732; + public static final int canBroadcastUseChannelTwo_offset = 896; public static final int canNbcType_offset = 492; public static final int canReadEnabled_offset = 1260; public static final int canRxPin_offset = 717; @@ -1802,7 +1803,6 @@ public class Fields { public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; public static final int showSdCardWarning_offset = 164; - public static final int SIGNATURE_HASH = 111802612; public static final int silentTriggerError_offset = 1260; public static final int slowAdcAlpha_offset = 1712; public static final int sparkDwellRpmBins_offset = 54; @@ -2267,7 +2267,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 2021.12.22.all.111802612"; + public static final String TS_SIGNATURE = "rusEFI 2021.12.22.all.4174194506"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 732; @@ -2304,7 +2304,6 @@ public class Fields { public static final int unused_1484_bit_30_offset = 1272; public static final int unused_1484_bit_31_offset = 1272; public static final int unusedBit4_1476_offset = 1272; - public static final int unusedBit_251_29_offset = 896; public static final int unusedBit_310_30_offset = 896; public static final int unusedBit_310_31_offset = 896; public static final int unusedBit_48_31_offset = 164; @@ -2901,7 +2900,7 @@ public class Fields { public static final Field KNOCKBANKCYL11 = Field.create("KNOCKBANKCYL11", 896, FieldType.BIT, 26); public static final Field KNOCKBANKCYL12 = Field.create("KNOCKBANKCYL12", 896, FieldType.BIT, 27); public static final Field TCUENABLED = Field.create("TCUENABLED", 896, FieldType.BIT, 28); - public static final Field UNUSEDBIT_251_29 = Field.create("UNUSEDBIT_251_29", 896, FieldType.BIT, 29); + public static final Field CANBROADCASTUSECHANNELTWO = Field.create("CANBROADCASTUSECHANNELTWO", 896, FieldType.BIT, 29); public static final Field UNUSEDBIT_310_30 = Field.create("UNUSEDBIT_310_30", 896, FieldType.BIT, 30); public static final Field UNUSEDBIT_310_31 = Field.create("UNUSEDBIT_310_31", 896, FieldType.BIT, 31); public static final Field ETBIO1_DIRECTIONPIN1 = Field.create("ETBIO1_DIRECTIONPIN1", 900, FieldType.INT8, brain_pin_e); @@ -4170,7 +4169,7 @@ public class Fields { KNOCKBANKCYL11, KNOCKBANKCYL12, TCUENABLED, - UNUSEDBIT_251_29, + CANBROADCASTUSECHANNELTWO, UNUSEDBIT_310_30, UNUSEDBIT_310_31, ETBIO1_DIRECTIONPIN1,