From 698aff7701ec88a320b11357a763bae4fb1befd2 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 5 Jul 2021 22:08:39 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 8 ++++---- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 8 ++++---- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 8 ++++---- ...ngine_configuration_generated_structures.h | 4 ++-- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 8 ++++---- .../controllers/generated/signature_all.h | 6 +++--- .../generated/signature_f429-discovery.h | 6 +++--- .../generated/signature_frankenso_na6.h | 6 +++--- .../generated/signature_hellen121nissan.h | 6 +++--- .../generated/signature_hellen121vag.h | 6 +++--- .../generated/signature_hellen128.h | 6 +++--- .../generated/signature_hellen72.h | 6 +++--- .../generated/signature_hellenNA6.h | 6 +++--- .../generated/signature_hellen_cypress.h | 6 +++--- .../controllers/generated/signature_kin.h | 6 +++--- .../controllers/generated/signature_mre_f4.h | 6 +++--- .../controllers/generated/signature_mre_f7.h | 6 +++--- .../generated/signature_prometheus_405.h | 6 +++--- .../generated/signature_prometheus_469.h | 6 +++--- .../generated/signature_proteus_f4.h | 6 +++--- .../generated/signature_proteus_f7.h | 6 +++--- .../generated/signature_subaru_eg33_f7.h | 6 +++--- firmware/tunerstudio/generated/cache.zip | Bin 1587450 -> 1587484 bytes firmware/tunerstudio/generated/rusefi.ini | 10 +++++----- .../generated/rusefi_f429-discovery.ini | 10 +++++----- .../generated/rusefi_frankenso_na6.ini | 10 +++++----- .../generated/rusefi_hellen121nissan.ini | 10 +++++----- .../generated/rusefi_hellen121vag.ini | 10 +++++----- .../generated/rusefi_hellen128.ini | 10 +++++----- .../tunerstudio/generated/rusefi_hellen72.ini | 10 +++++----- .../generated/rusefi_hellenNA6.ini | 10 +++++----- .../generated/rusefi_hellen_cypress.ini | 10 +++++----- .../tunerstudio/generated/rusefi_kinetis.ini | 10 +++++----- .../tunerstudio/generated/rusefi_mre_f4.ini | 10 +++++----- .../tunerstudio/generated/rusefi_mre_f7.ini | 10 +++++----- .../generated/rusefi_prometheus_405.ini | 10 +++++----- .../generated/rusefi_prometheus_469.ini | 10 +++++----- .../generated/rusefi_proteus_f4.ini | 10 +++++----- .../generated/rusefi_proteus_f7.ini | 10 +++++----- .../generated/rusefi_subaru_eg33_f7.ini | 10 +++++----- .../com/rusefi/config/generated/Fields.java | 5 ++--- java_console/rusefi.xml | 2 +- 49 files changed, 167 insertions(+), 168 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 05c3257ad4..aa04480213 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 Sun Jul 04 13:36:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jul 05 22:07:56 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4250,4 +4250,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 Sun Jul 04 13:36:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jul 05 22:07:56 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 65eaa930e2..14c02a7751 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 @@ -176,7 +176,7 @@ #define can_baudrate_e_auto_enum "B100KBPS", "B250KBPS", "B500KBPS", "B1MBPS" #define can_baudrate_e_enum "100kbps", "250kbps", "500kbps", "1Mbps" #define CAN_DEFAULT_BASE 0x200 -#define can_nbc_e_auto_enum "CAN_BUS_NBC_NONE", "CAN_BUS_NBC_FIAT", "CAN_BUS_NBC_VAG", "CAN_BUS_MAZDA_RX8", "CAN_BUS_NBC_BMW", "CAN_BUS_W202_C180", "CAN_BUS_BMW_E90", "CAN_BUS_Haltech", "CAN_BUS_MQB" +#define can_nbc_e_auto_enum "CAN_BUS_NBC_NONE", "CAN_BUS_NBC_FIAT", "CAN_BUS_NBC_VAG", "CAN_BUS_MAZDA_RX8", "CAN_BUS_NBC_BMW", "CAN_BUS_W202_C180", "CAN_BUS_BMW_E90", "CAN_BUS_Haltech", "CAN_BUS_MQB", "CAN_BUS_NISSAN_VQ" #define CAN_RX_PREFIX "CAN_rx" #define can_vss_nbc_e_auto_enum "BMW_e46", "W202" #define canBaudRate_offset 2108 @@ -1298,8 +1298,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 20415586 +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 3914944859 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1652,7 +1652,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen_cypress.20415586" +#define TS_SIGNATURE "rusEFI 2021.07.05.hellen_cypress.3914944859" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 9f1b7c7170..2705670a60 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 Sun Jul 04 13:36:44 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jul 05 22:07:54 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4244,4 +4244,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 Sun Jul 04 13:36:44 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jul 05 22:07:54 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 6cc949259c..082104d94e 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -160,7 +160,7 @@ #define can_baudrate_e_auto_enum "B100KBPS", "B250KBPS", "B500KBPS", "B1MBPS" #define can_baudrate_e_enum "100kbps", "250kbps", "500kbps", "1Mbps" #define CAN_DEFAULT_BASE 0x200 -#define can_nbc_e_auto_enum "CAN_BUS_NBC_NONE", "CAN_BUS_NBC_FIAT", "CAN_BUS_NBC_VAG", "CAN_BUS_MAZDA_RX8", "CAN_BUS_NBC_BMW", "CAN_BUS_W202_C180", "CAN_BUS_BMW_E90", "CAN_BUS_Haltech", "CAN_BUS_MQB" +#define can_nbc_e_auto_enum "CAN_BUS_NBC_NONE", "CAN_BUS_NBC_FIAT", "CAN_BUS_NBC_VAG", "CAN_BUS_MAZDA_RX8", "CAN_BUS_NBC_BMW", "CAN_BUS_W202_C180", "CAN_BUS_BMW_E90", "CAN_BUS_Haltech", "CAN_BUS_MQB", "CAN_BUS_NISSAN_VQ" #define CAN_RX_PREFIX "CAN_rx" #define can_vss_nbc_e_auto_enum "BMW_e46", "W202" #define canBaudRate_offset 2108 @@ -1282,8 +1282,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 4270999710 +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 385654183 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1636,7 +1636,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.04.kin.4270999710" +#define TS_SIGNATURE "rusEFI 2021.07.05.kin.385654183" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index d4888b1f6d..907d4a98a0 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 Sun Jul 04 13:36:48 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 Mon Jul 05 22:07:57 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4250,4 +4250,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 Sun Jul 04 13:36:48 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 Mon Jul 05 22:07:57 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 ffa77b2f74..3d0e696d9a 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 @@ -176,7 +176,7 @@ #define can_baudrate_e_auto_enum "B100KBPS", "B250KBPS", "B500KBPS", "B1MBPS" #define can_baudrate_e_enum "100kbps", "250kbps", "500kbps", "1Mbps" #define CAN_DEFAULT_BASE 0x200 -#define can_nbc_e_auto_enum "CAN_BUS_NBC_NONE", "CAN_BUS_NBC_FIAT", "CAN_BUS_NBC_VAG", "CAN_BUS_MAZDA_RX8", "CAN_BUS_NBC_BMW", "CAN_BUS_W202_C180", "CAN_BUS_BMW_E90", "CAN_BUS_Haltech", "CAN_BUS_MQB" +#define can_nbc_e_auto_enum "CAN_BUS_NBC_NONE", "CAN_BUS_NBC_FIAT", "CAN_BUS_NBC_VAG", "CAN_BUS_MAZDA_RX8", "CAN_BUS_NBC_BMW", "CAN_BUS_W202_C180", "CAN_BUS_BMW_E90", "CAN_BUS_Haltech", "CAN_BUS_MQB", "CAN_BUS_NISSAN_VQ" #define CAN_RX_PREFIX "CAN_rx" #define can_vss_nbc_e_auto_enum "BMW_e46", "W202" #define canBaudRate_offset 2108 @@ -1298,8 +1298,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3994505636 +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 108627101 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1652,7 +1652,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.07.04.subaru_eg33_f7.3994505636" +#define TS_SIGNATURE "rusEFI 2021.07.05.subaru_eg33_f7.108627101" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 808aaf0b71..a8a8ef07df 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 Sun Jul 04 13:36:14 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:23 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4250,4 +4250,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 Sun Jul 04 13:36:14 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:23 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 696b4fab60..74c709c382 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:14 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:23 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 726ac88488..30df610867 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:14 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:23 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index d8aafb942a..b357afb3f4 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:14 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:23 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index b77c47fb5e..6e3d035b88 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:14 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:23 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 9ea430818a..2545b5402a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -174,7 +174,7 @@ #define can_baudrate_e_auto_enum "B100KBPS", "B250KBPS", "B500KBPS", "B1MBPS" #define can_baudrate_e_enum "100kbps", "250kbps", "500kbps", "1Mbps" #define CAN_DEFAULT_BASE 0x200 -#define can_nbc_e_auto_enum "CAN_BUS_NBC_NONE", "CAN_BUS_NBC_FIAT", "CAN_BUS_NBC_VAG", "CAN_BUS_MAZDA_RX8", "CAN_BUS_NBC_BMW", "CAN_BUS_W202_C180", "CAN_BUS_BMW_E90", "CAN_BUS_Haltech", "CAN_BUS_MQB" +#define can_nbc_e_auto_enum "CAN_BUS_NBC_NONE", "CAN_BUS_NBC_FIAT", "CAN_BUS_NBC_VAG", "CAN_BUS_MAZDA_RX8", "CAN_BUS_NBC_BMW", "CAN_BUS_W202_C180", "CAN_BUS_BMW_E90", "CAN_BUS_Haltech", "CAN_BUS_MQB", "CAN_BUS_NISSAN_VQ" #define CAN_RX_PREFIX "CAN_rx" #define can_vss_nbc_e_auto_enum "BMW_e46", "W202" #define canBaudRate_offset 2108 @@ -1295,8 +1295,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1129013170 +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 2871364235 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1649,7 +1649,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.04.all.1129013170" +#define TS_SIGNATURE "rusEFI 2021.07.05.all.2871364235" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 10565c18fa..c19a0656cb 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1129013170 -#define TS_SIGNATURE "rusEFI 2021.07.04.all.1129013170" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 2871364235 +#define TS_SIGNATURE "rusEFI 2021.07.05.all.2871364235" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 944f24a73d..68913982f4 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD f429-discovery -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 20415586 -#define TS_SIGNATURE "rusEFI 2021.07.04.f429-discovery.20415586" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 3914944859 +#define TS_SIGNATURE "rusEFI 2021.07.05.f429-discovery.3914944859" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 05700f6ce3..ce698fab89 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2063978891 -#define TS_SIGNATURE "rusEFI 2021.07.04.frankenso_na6.2063978891" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 2473264306 +#define TS_SIGNATURE "rusEFI 2021.07.05.frankenso_na6.2473264306" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 0a0d49b50b..8610296070 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121nissan -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1654215394 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen121nissan.1654215394" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 2331477979 +#define TS_SIGNATURE "rusEFI 2021.07.05.hellen121nissan.2331477979" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index ee2d8c5005..d9aa474b85 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121vag -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2977936895 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen121vag.2977936895" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 1494311110 +#define TS_SIGNATURE "rusEFI 2021.07.05.hellen121vag.1494311110" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 1897592742..40a50c4b56 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3031780182 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen128.3031780182" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 1557896815 +#define TS_SIGNATURE "rusEFI 2021.07.05.hellen128.1557896815" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index c3b69af46a..916000299e 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1928278861 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen72.1928278861" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 2592204404 +#define TS_SIGNATURE "rusEFI 2021.07.05.hellen72.2592204404" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index e225da8c04..02928ffe22 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellenNA6 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1054237370 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellenNA6.1054237370" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 3602429827 +#define TS_SIGNATURE "rusEFI 2021.07.05.hellenNA6.3602429827" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 8d03593d72..0130c65377 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 20415586 -#define TS_SIGNATURE "rusEFI 2021.07.04.hellen_cypress.20415586" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 3914944859 +#define TS_SIGNATURE "rusEFI 2021.07.05.hellen_cypress.3914944859" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 31dd877524..085b13bc84 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 4270999710 -#define TS_SIGNATURE "rusEFI 2021.07.04.kin.4270999710" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 385654183 +#define TS_SIGNATURE "rusEFI 2021.07.05.kin.385654183" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index eb05f7e66e..04f49679fb 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2790485222 -#define TS_SIGNATURE "rusEFI 2021.07.04.mre_f4.2790485222" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 1312668127 +#define TS_SIGNATURE "rusEFI 2021.07.05.mre_f4.1312668127" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 0e8e7d0fc8..fec8f93ba1 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 2790485222 -#define TS_SIGNATURE "rusEFI 2021.07.04.mre_f7.2790485222" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 1312668127 +#define TS_SIGNATURE "rusEFI 2021.07.05.mre_f7.1312668127" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3fe96f32db..61d48f7bdf 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1373461892 -#define TS_SIGNATURE "rusEFI 2021.07.04.prometheus_405.1373461892" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 3115550909 +#define TS_SIGNATURE "rusEFI 2021.07.05.prometheus_405.3115550909" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 88456a6ac9..84de34fa32 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 1373461892 -#define TS_SIGNATURE "rusEFI 2021.07.04.prometheus_469.1373461892" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 3115550909 +#define TS_SIGNATURE "rusEFI 2021.07.05.prometheus_469.3115550909" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index cd503fec70..dec6a84776 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 721281705 -#define TS_SIGNATURE "rusEFI 2021.07.04.proteus_f4.721281705" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 3264427920 +#define TS_SIGNATURE "rusEFI 2021.07.05.proteus_f4.3264427920" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 6880eefbac..bef358e57e 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 721281705 -#define TS_SIGNATURE "rusEFI 2021.07.04.proteus_f7.721281705" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 3264427920 +#define TS_SIGNATURE "rusEFI 2021.07.05.proteus_f7.3264427920" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index d130a5e391..4ae7cd4a67 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.07.04 -#define SIGNATURE_HASH 3994505636 -#define TS_SIGNATURE "rusEFI 2021.07.04.subaru_eg33_f7.3994505636" +#define SIGNATURE_DATE 2021.07.05 +#define SIGNATURE_HASH 108627101 +#define TS_SIGNATURE "rusEFI 2021.07.05.subaru_eg33_f7.108627101" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 360cf0795cea715b0322df80506569982e809266..13ffa531f5afc9ee1204ea1eec9ea8189cdf97ec 100644 GIT binary patch delta 330987 zcmV(*K;FOl@nD?tV1R@HgaU*Ev;=rJ1MRTomwPt^GYg)A<6xeG<6xeGS$(_APb@p9j+*nD!I+lAYDf@eJoGx*hS}^oUcKWltTw^h(#W5Q1YzZK?psy9t)@$!XETavp`yq* z?=<79!-%|JFYVD|xzaIzb{F0+;eOqJRbQAhcsoGGRK>E-Vx`Y0vI!EZ2@&jc`do6Z z@VbKn_C0||R@u-nhP^O^)^t>(+SZYLG`7V%-XVjIljI z6=C`^bH@Q2X#2rAjqywzj2aRwwzsTe;NgsZH(1zs_YC)+8Ny`T!o0vxG*HVl4!-7? z6fK>+Xi?87M$s$NJ_N|AZAhH=E6m#&G}r`7YeMhh@$;_mIAZSTXkh|r&wFBOm6efm z4yUuxsKGiJ=Zkm*?7srOW=xcShum4Gj=)j47%j;##6lU_l>?j+2_iZ<;|bdbWEd;E z%<8iF5d54myNih^C|fe8n*}7!n2TIb@RC91L9EhU*Av|bDu`|-e2vlmvR3o6Fjqd@ zeo$=aqcT<XyPbs+(Lp0ur?hHKslZbC2ndvak~v20JR2LE zLFhf|9aMpPSQ{(AP0|C_Cw!#6!G=DUG2UOxr3!cLK90wxO(2Fy%U0-~cCFPvIBc9) zqwQDAn^v_Ln=2kQj~Sq1LczTun7&Ki=U@Z0EMMgp^L>`%s|z5;&fzOeKvEhqM0S%o zoB;UPipQ`-uLBrT^pzri`oKidHGb2{OWv~h0~j3?U-TIXgy1-)*=U`D7vbvA%N5g+4rnJIDZ-2!loiv5 zBNNgds75-sAI&<=8V4u?XNkM=X*GC{-U0*F;Jq7ow@0V?!_Q8C?L)23A!>X9;_4G+ z|B(mIxg0oV51Xfb=YYXbl(*{2M`xrlSZW_CPVyy0Gv$I&;X^N*EjZSRH(K1+>goqg zEL*%fhdVR`KLEeuRF3vgFG#h2?DPs&gm4Xb`_{QW{lF39Xgxul9ry2E?(W!RAnBiAII|Jz+yZznTxd@ zUks;JuzOEVw%+7QA^eh^7yT*82ge0=YOtKoV?=)26DlHq(m=CVq=j$LdIUx39Gmwl z=te=ye=e{4P~i_yTNhRY9lQ1k8PAD6Yqn2WYjR8rq3J@{6xBv3DCFlN4%sRze;B9! zl=d(i5Hz;=qG(dmeS?|cTm#-Gughm@gjcAryvW!sM3#dMAC5M|<`G{HmqS`;f>=5b z$kKsemJS4ev~)Am4Tq#vrx*tf=3$Fo8IV?J{Ths~{CQ?lYYVrO_>8Ry`F1!Koh2Uj zq#hMZAoL+Alr8QWm{uIETgp;tFCS&G*Pcja}Q5S3$6`@wMspH%>3>gv* zk7oqo{gl5Y8}~qAEuh-l(WnTq;{c9-m1^dHrHG3_$6CRC10Jc5DK2~^6+s1n=#DVr z*z%5Tg$ea8%xR-OM<#n!mH^ae7pk9AQ;xAx|fHWo# z{v;KD7SG<|q5>hQ4&Aa?&^;%Gon@p-lt7UHC~$7b(8FjnU5*3edW(9pw`h*)FP`5j zib1CGVZI3zo5o*+Bs8a>lS*!gzC4-B)kyl0lrnIa`~Y}!jO-iT8w1eeHw`pKRCrjE z3}t2mgv>ew84vRRQ&D8xvwqR4{2dT7Yf8$02<96Y1+)7&7F)TShvMCP#W${o5nEKV z`E1*)`Fy^^jg&b#Ug8Q%<=cX>xrxe&*NvHby`B2%g<(EVlmgtU^k#mm#GA$qg+6`k z4&|GTDGJ{Swsw@j@>vC8%|7?SNG|yW`1rY2AWG?uipt9PptOrfH-#EZ_QBc90Pj$L zG!suzE2@1F$@wSn7jQf<_eNYK+>$mzX943C%Y9NA4WH^)Z!$kxykaSwP23}79wnYq z8E9r>+cp!`N)H=|RAq#I=fAMCNh=f@y*9-F{?NzOIWS7c87RU^g4G?y_QZ~jDl3ik z->SK9qS?SHbP>T4$XxrHF5!4nHGSTH@@0}zFb`0R_R;oO)7Uq*va=>a?X21_4Q33K zvZ&1Nd+0PG9?R^wO$}HB%c;tp>v=5yIQLiPvZBGKRx`l2%~^C1&P5RUGvX%X5`S(qRG;!LTKNuf_KU zdEt2<1k=eN4V8tB^Dbi3n*?F&&{YAeZmau3uN&Ka+sZHVVz-w5 zFYGyu(S>`R>-_ninbx4Sbw20$b!TlxVLmut(S|aMW|~%%C@V(Nn5$g`gx(@q^MO`) z(TDL}eNC3}-TvAy2W!6^<}12?pC{hpD?T(@8<=hMZm<3*)<-0e1eG zKbd2q0wUtx!h{Hnm}V^{L<>2cY57nekVzA#$KGF8B$Dk#!a~E zF}QJIvjWXIspB7ypMnkabQfO)Pz$XSWOB%V*n6ON#N=T7Nc&{M6wSoWFiNt-)}0hC zEw#$g{(fRyO0Dw>qlJrq3}Wycjfi_T3n=P+cEfE+;7aSWCgXR{aIT}*NxOODBnGV= zt(=>)5r?Z-!+>RF-2uR^OMxR*010sF27TQc11k9XA-6_mHuuV^QsVifb>K2~gWKsQH{ z>A^*7*ZFwb-F4dMU0~HUIz6g}h&QLW?`XS>q`=TzpxOEpP{AefQ-4fnQ6v)>_B-e2 z?LJ?Ni#Pz`N$7TeEZoED#uAxTGg)&Mr2gokOE1=uU@OI%b1{ti2>ntJ%YgtCn40Ct zoF5IpY9i-Ha%MYuYUoFOE7?LN+gdpQRC8mAh-w_NnuzBZy)Pg7Km?AxkIiSp<{~ z$a=#0W$_T~U(a9QMs6ce8r;nAtW%wTJR?X60b+t(eKS`*wo#526c|c-{Rs&Xqk5mQ z|CBQssYT(g2cIdv8xA$j4X+lIY%0{FaTXA3itFh(^F7PlPhdTr2~-cXUl?t9uz)>)E&yGWgT z%cdr(mPC&QoS{-Yo;+vp70(Y6}!L}%eG$hHpjuyfC!Gb3Mi)ECp zaB<-vr#&hn@gK?GMQq;bE}2CRqhpbs&r6y{QUa2n-^g&01X!Odn(j@gof>@6-ahSU5K2sS2xf-L+eM}pQx*yL<~v(SmKiw1<^ z!Id(q2*ooCIgS~7D3FV46rkB8aG0gSQ&x`3Ig(fCn)Enx|EH!G$UXR6!o}2T^6ABI zNM8}qk}2h!i;Pb=G#^yPoT+3&5%#pD6kH|QX&BEyHL@D0h+9v(Y70=#O^2Zu9 z!U%l2e`{AW%o#DpsiHK0?8X=BGr~BgXE6i0EP{K+rJ?gFTqu}b%&LYRes&@_bO}Rn zii;~8nMbV~%swHDfv}Qp`^x#W$4|Hl09ddWs z$(nc(GH~@H_DUjf!QfsD9mp3R1%*Vmfa^s6>_SnCjmhsdFWl>Y>-J@ynWcM#3#Z-l zZ^2@%z{M1X6bOV(c}(%APLy86(=mNtE6>RiDT&N?&VKFS=&*cTK{S`@|5H8QtL%#3 zHQTko42NU7V8D?(b~-KNCikdWqEk2`-0>LiUbz5Ly8P@GNPefITFraFyDFMD=nM!> zc4%8HtrNe{-90aVdqGME1dD`v#bTIVut4x;vx(LHeQKPoY#5!f!egg9mm2#1I3x}U zzKD+@Y7(J>LM4P0AVXbr8$$3xST9#s?sY4_Ztmw{yyoJwF&_?>7Q7`2*$WpnFd(?$ z>=>)Rw9kj@maftgkoZ0GmRSPZ^cs^oQ>uRB_J_J-Q_ycSe-8WfbcyE>JFFKus#ojE z9yF7Xh2vI0dzOJm=ZS&GbDD)9&6E!^x4StG1D$-)RWhJXvOD6RZE=`Yx!f1jRRJjt zUMN>I1ho~x9_ll+3=64K0dnT%JpR`Wc~llbyG4Y5A~hiEpo7esXo?iFqZZliTq*O# zkWChtn^%jFI5v9tfSekFPp6ElEY?bmZEpPvz*;${c$Yg0fo}HL0t!nBBg?vj_8{%{ zJtv6}`9sO!1bYhvs;GBB{eg{la<>LPuHKQc5CMWoz5n>B119!(h4 z6@4{-VT`K|;s*M_k=|4eOlr8sQtC~vfENjSW*xI-H$u2Kf{;^fIJ5PfZ{BR*A_CDH z$AOmMzp}sxQ4gN0(jHybi_K9<8=1+^EWBS3_ZRD!-p+sF(Q}9UkzN1hAx%6EZZ6B3e&6_z#{&y)rZ4W0ZurwK!Z z7z41tH7KnE%MI?#0@5f#6YaeAIU?H2KA6CuQ!yRLg~uE2AanK#v65*+S1Qz%;%YFE@Yb8v z(%=m@oBXr0#x~t+um8#G_2HKG$=Sw#$Hmue<9oj|>@?lWEQP$-MyN?tJWPpC$PR_k zA|#My;bSJLfGE%KE`JXsM2Few_q%=X^yci0Gz>qtG5R(%UPeSXE?{aVF%Zg=liT)1 zr+L}-I@f1iN`G>KKFTC}aR<###~h}@YxxboGUQdo`6z zRt!v(6{gRok_(dCSAdtuyqNQdM*-1!6w|<%hsi@QCcrE577@av5N{X_WKOu_z{I2d z3GojJ0l*lBRwkQi0w?eS(}c2+EoJ*HHme?3jP)NdK3mR48TIL~)!Y@+9;Nkz991VXU0M zPeR5oM@xrYk&Y5(CB_0^|2OfIB6&6g1gW@1N<=Kmmb|VsB0V>Mskyt=%!V&h`W|C6 zm5Mo-hg2X&sX1?Nha~hz9$qwikB`Wm5puamYiWfw{TU=45DVJ44~kwZ#STRx z>D~$TP87jepl&jKHuN&kF;<0%Oc!|AVe<-wyr=jlnm%W`(|oC1nLd9(F~ynudb4^Q(PPLSSp;w=W3wuAzvt1R8qK5Bb4rT$P7w?e5w zE@^NzietC>B49-NdLzN8h{56pEv;wqgrMBPyOs(o zdHU?o0b}7KQ7aWUU0A8};{9ktV}YZ_3f7cd^jaoO4TL@a`H`@CN=EAD(3pK&Q_iN& zm8o-^8X&!YTUU1Bd+A>mh=b;2n1@uiqJR=}+t~imh6NSe6}vQ3`k9q=m&t{T0NIbq zMMX)3koioa#n2yCF*76Mz&E;xa!Q989?^`_CVXX0XzSpPDf}C8nS{yh@S8&OU^_c8 zROqBHuKMJ*uYvvOYetZY9qTE`37S?fQ=`MZD@Qti4P_xny#wFZ+%c@+Dq>Kji`pQE zHpY9Nyhd=%2AwvsYoQc&LngQ&0wajQ0pQP;qWP_+*TXyYu-${d8R1v%rz0f)Z*tNB zzHeRmUjmK}r|&Za-g{15O7kIj1lk^?pQC>J?>C)(yTzua%+7Qpj0?J^yzI_A*q5LMhaa)D`QAq+w+8LXZN4 zl%q~>U>fYY)^G)9k|5d2c~6ZOk4Hxb<#o<~Q~V!Ew9a)Y`&_K?w+lh>a>KCKe%Y;s z!tgL~0CfI;RX&`Y^xWo;-qp?J(32p(Cnx_~E5Q)pA~%PZH!j7g&Koo={Y<~iRGvfe ztcRn3I|VySBze4B6EXs0gWe9E--1P~wRwzxgLe|ff<+h)a*oN2%nz$tOIF#?nhYC% zB5O?s4nYL!m;KtW!aKTYcRD^r)90oM-_?%BuQZOAUGq_aVD>s zKNw9ne;@l>wkomuJJgTW*Qp;(#=25JsNadS0v8-}ipVHtP%PS@kAEcU(kzp0VuMfM z)MwMXm?7+@nE{?QLhiWD#!hd6$B5j2PT7FnmZaTx1-jMDE=Q1q7pRy;br%7V*Eu=$Hb|hgGQ<6r&ie_WhLA_08T5 z#`GHnjz~E|Ae!mWP-ixFGFyKYG=XAV5HciM5Kv%Cv4ojprzzS2=FKdiDSCB(b1I&U za*bz6OWy1kU8&%;Wxb3qbf%9B*!2aup76bujo#!M(ebTDNPN%A0UT=*(Sbxb6q9QQ ztq)KAKxSV;${oXIMvgoiuR3gKd~f=uv7JnFu12Zvh@jutI_o zFPHXbiH>oP)9CD%|E$)FoA*b5wpWc>Ey)bS9g_9fmjFzLn?F;eVP#7|bSb&y(Q z=DZDyx{&Zx#p_ERmZ@oJgYNn)#~k^KfSmchGi#}H>%w>`)KlcQja32$r31f{81~+X zLcd(hDKsbCx>82dVn>jFw@5G9%{8Z1_vz8}Il zb3YmC(8wy`euQPa^x~m zF@o~#)q1OcMN2a%IJ1rF6=g?!MGR+u5ONuz&%m_Yg;T_Wyn7Z+ ziY{=$LMq}MB9aa`Y7Qb}5c@%MOdCRQ?nrvl`#USxC9ekPn^;@*zx#3bG|p zT+O_?{kF>s`+1Og2Mh25vqdYb?MN-Gk8oTl(|TJ0kWI$zYvzF#dN%l&Tt-~nAsDiG zNy|jWj#`+1yRInj!3;U&p~csW#*XZHg;;9q*b=6-=y?{Ya6LB(JA1&6R!3tL+tFVV z*4A^VycMsS&(TeU?md_tof&|aM62KAA&yfuXNlBkd9yu3ZSZYRExIHiL(J$N!(NS1 z2uE?QVRE!yx+uzA#zb*ajU&mSzt)7p!J)ykEg{Tub`i>+%q}qzZR~!R%g0e8hR8$pCL;`U`haXr;C`W|yhHUF14yl2&-PBY& zhmX1~8&lZ{v;X<@S$A2wlgSg>q*J)nDKgb=@ z%%GDA?*8}1unanyp|mg~T$SVen`&A00?s~v;GnMH2pSp}kjd1~T(Wo__&PYoTWrXc zKD6G-K)oxM%6pYk`8~&Cg3~feh{%z>0f}qjh>!RL1!C55n|nAza@(8&*UL2N)KFk5 z@@ia|W{B1-k=0>|0Jl7kr}~DfgD#4?gxCm*kOti8pH-MOOsVw`#^3<|a8&p1P=i~4 zFMhpW{Q98y^@GYicla&SYc*Zg^phQ217bU&o~kHqB|qh5W!ru zJtu637L_;yOxKSk;w*dk4Fsg@+{iRsu$!aU06IXuv&=j2Qz)d?C z8=|q}rX2Vq1JQuj3hsa;c#6dAEdqw81WNfpHbP&65khhN%?QY0itR8m&KGunrzA!R zVh4nRvlUnERY$0vP{u7`X6Du<0pliL!s(y)UFjo=c4?qSlF0bVYlLl z3fM-UJfz}i2%D~9Il@)4kUd7Fx0w%BWBWE|epuaFwP1bGG?*+9l#ilpm#lph3_y8L z*>rHxml{lY&>3ipZ@dr>) z{QB*C<@WwPb}p;5PTf9EMxX7&eS&QE?u`K2?g$3Vssd)<^;HyFYFWiMr>RvuT}QLxO$-|psUiSb zJ^=Qn2CR!^nypgj>B$d<{<5*dPTV8|BadMcB9bT+Sv&Nh5n0+7@h}LJB%I^*Gjkdt zhhnm|#{*x2HI|%zVqapKP_}Jdfpu=EFF|^zVOE7>J={OYuMUG9%8DwECHHc?xRr8p z$gVGzVA^1yxrW%=Du?zzRZFtVh!Gy80_KN49JF`D00QCBFqi>JHaq0-B<##WI?~o=zf$N)8 zh{9mlW!oqO7D7RRPgX8bf$0@OlN`YypzNh=Xyh~j>LKU-2s2DiCL67gM6@@wKPNj4 z&FvGUQXF5#Pk#gc7dSP(-m(M`F5u{Zg}OpW_9hDgkt>7?XkhL~1$4sTi)kE_yq>N3 zP~Bv+gL{>KvOy--7k?4nKddXCg!-E+I9j2@+KY(9l^Og13OP`)j0HaVVXDnp*~LqF zQwgRRoO%y%l~lA11*w!lA^A|Il3aw!rE)n(Mhe=~!Z@~h*~A!MGJ&IrG|Rh$RQ#!U zd6h^OkvVj|O(cuBtKB`D#UQQS&?u&0h7uLm^JtoXs>?K5*%?&$G)Vo%PTBb@>@xv1 z3t(?bz$7$4ATkUa6Oy>%)3_;}GSOhM2p$m{c8%R3p^PU<6GU*kd6nIKhX-bj;LYIFZXmELB5uwir=F_D67@*3DklURSaNbb z7TLGz>p9{}ZtQG#GO-a!MTN7g0zFtC6`zL4XNb;Jgk@T?TXYvj{^FT&I~hS+lTBy{ zTnVqyTo*mJPy23%Vu!3RfU&jTq45+}ih>Z03OoDi%o@P@-qvJi#Ef}{7eF%WK)o=T5EcBSll$uh?jm<=XvVy>r|U&8`blD4a6J z@ya|^%Q-gr7hufo3zbF28}NCLZ)wthI&3l>U`mOm_5PxXX>2!hXKQuey2h=okoLE6 zs#vVB@=q}?SJG~oK0I~~d=?c^%2<)?12Fk)PFD^*CR6x-WBWEA#SVdj zDyytCqTk|Whi+9vSUw5a+8Fi8mSw$x#G8jvrE3?-l=Xq86a=XGKzof5!b#G9Mm7}Q ze#%g$D67j~$f_2zL`%9mQTOp4>lcU*B%@;B7+7mThA2opxQbmoihK!+0T*vP?~##plT2tT&+7GLx;&3s3YR9=GvR9y_hdM)a9P zAFpiMILB?0b~oGR<~lLEM`v$;k^u=I3M#D%ycM!&6rs)$V^L0K%Tj08VN+ra7L7Qm zIF#Dz0$I?2@il#C5`i!1R*kh&3 zfPN7CoJb~CCHtC)oQ+U(vqgW>#tG*55}f4Kar zV_-CLT!^SPgbP_yRNpE}#mUH}zU&NYU2Sxdtu9(dGyjW1|5fZLtNR$^5e+WoCWJ;^{xd9#2~c*2eEgpo zd_+O0?&d?U5HQ8wL0KAqjC^ix#Z)rNFT_*Ep{<)^VAUyrHR<9w00N4`LjC7?M}kU$ z$FWau8UE&N3Ee$WdWH!lbLOaJcuh*MUlBtV#~CVPjNQ8G@Em@JezhqBQh4lg%_$H>;{?;YONtlu)O zXw~PANA7g~;FA?ItL5F5@xi$^$Pk^+Z$glLHhzao!<+v-n=9Zx)^u65O^$=JPpH z5hpOgg2TCgj|lr{+vmeI@-6HQG=RZpZ8pY0)$5JQiUzi-N7fif3|ID=kwm-y(TGD4 z<3sa#>R_a6WTF0?jk8_c3l6#`Ck3_RNasp{$3HUG?pgm|J=g_k*VR|TT^B|Vss5|O zhv0JfUA}vN)!*m5$NH8^^&t0rn0r3TJs;c8wK6a4=x!uy`uc7}5F?6K2pZ-V{>VDd90mTxltny-#7`y*B`&Cs z>o+~Q4_$KXOjIAB+t9jF)CXm_LbJTXkyAy$Yl((`l%!7Lb|m7TC?CZhpQD?kY-6oz zpiWu(qlfuqPD03aV83Pp1(VNbHUs)BQ`Kx>?%kf!gc&A`%FSl9OzAo->hG8c2oyol zv{u!z`a5PUkzU1l=idPbxJ-lhMVCXC0YM`?f<5(yZm-?{mF%97`=raOh#1NGiqKN? zcBrp^DFm54G%#Zm9=n8U-bap&#xO2I_gvyo7Fdn}KiJ4e38(jwKaKAhYf=sT1dYTG|$tB}O#($i|HkQz4NAKz8zA5-ZCYn7b;6vIVxDdH`PvJyY3uy3nkUdJd1 zSNlJqq~JcLQU)m3ZeUzdURjx3as~RJk`IWzoSw#QQ;Z&69@|U?!0kuji zrsjuviKEc!dfltOVs{(KYu}Q*_Nv0?$h-?naOPuo8#@HRXSjX8%QOmq?}2BS1sL!t zm_CbQNgeIoG~!{&aFenYFp6Mss7VQ`L@o){ff23;Y3j+d!Vq z`E_TA2Xav;V%C>3_?V}-#|BK;o@ONr4w*IA5A+mND?|(#GSp0Q;#uQ0P5Az_L0mPC)QB(N>`e6r}&cssof_oZ^!NGT_8{F%@0gmVQG( z*r=%DG>Zm@uU2V)R_tf3s*TuourD`XD9l}2R!g)}J9ufEvcIy5K9V?bIMpX%ep86T zGp67H=H9SGKyuRNSln)8d8;<#m;~U+*W%H?hr&0*XH}brkx4)^m?q&e*}`9qa4Gt16<#Ku+*SnASTE*^u5$b<|7_2c7XrOvH?y_g-cKL5U~)jw8q^_yxw zGIG|wxne8#@2+L5YN&CNPTuDu=xSxydkNw2Rg|3{1BXZR7oVi_dRwA9~;a z^V?@JFi4J%Mbc~9`wrUu+isp?N)UqXg#e@(6PODF-k;CN^&n@Dk7kl90(O$FD`~^3 zr`C#l`f63^L{U%^BO$ETq^-9o5Io1U5EPz&1QcL@2i?{Pa1#oHv1D1Ml0c&H!1SBnig#`mm zPIw)K0Ye6(3-Mm3%PP6>F#1Qu0XX#AWBIGsGC$w#-f8FurI%{Xl_&F{y2=4;eU`JUWjA zUzdqCv`&E54g^Tm%EAo~l-gmHBX2Gf>hh8GULao&Bo|M2iWw={^%E79B}kEf*!Jf>ZIB{&a6{tcg~MQh+O-D#z*zCh2s^7r zLWpOP#8(S|Eg=OcU)YTWh=w=4L#Gvt-L=7S-4bI}%KOJJ%5IeZAgd^p3n5~PnJ>kX z#ZbX$f^>ZJN|~Ki%O7;WSrMDP*6qfEvCnm+zF8EU^+efhD<4Kd1ln;O!8g=@ZVbwl zA323RmdchKi4B*maVIb)Jzr5Pd<;2OHSNPGZkGn7#@PFTqyaNIMz`kskdj)s*r z&F2MNP&2$)4zWE_!9x?LT`ql&+US8>sh1AnXGMNj;P=r!{5~!n)9W(*E;qKn$LJ)v zARO))a2IFiDhLN6Fzs86`pOW08__A4%j3i93q!0ekzX3*47QzzdH6ej$CABfltS%y zjMfSf$fVvca9IXfCPFFKEQyL_-wQc-j*0xL+}*^J49=~R<#szyk4 zx_AN<#-mSz3g$&ts#yBI7!P@WP4oMX+9#QUkA;(LK7G zl$`TLyqst7&+NmKJP@RREV}BW^_GrBsg@-Fud1nTHbM3BOZ;yJxxgSrSUHeu1Xm@MdfuOvp# z8xgtU&y{1j`pRD5Oss2|{+<72g4-DY#>Ec=L} zUoovKvv{;BXH>0z_$xWA-_S|* zQn;_J?|_*cXHKr($P5-V|b>mt>Pp)9H8+Q28V>4-VAO6K-V+eQuRh_GTgIa zyFVDZ{h@b%(Y0Ibw2NKyH{_5Mhr{7;M*ga)`Y+g2tejswRcqMJld%1xz=j_< z9fc1yyx;rx@i5xM1wTEKivb9v1P--m;m3c*D|#kRd$eeG=yn`GiGu`dX48{n$#*~- zUXYo8VZVk2T*t@&Tf9r6NbNlG`HFHA@TaeIQ?uK`X&Lh$z*>J}dMRZoLh}RskZuoS z=?f<2NH)c5V=B%wM=*?)TCihhKI)lmUh+nx*i+mlsW;QUeS7_L<%Zm!FWTo;B!ye~Dk zd+mPK2x!}+3#9+DP2~$9uLbx5Kwe>xHP;uYOzwOm1NZuyW9udJ5otXvBo3Dp=w`|2ro(-|3<{ z6?AA=nVPT|&p?Y>(Mu2qLkyAkIEMQKH1lnkVcR@I@(({R@j{TYMNsVaCj7|7OHX9aSH=It==k;oTf;mEa z7O#q#H%I<%bRXFmh2;Ebn*;nCXQ+>0tYIeL@3 zFpodPb#*u+k)4~}A8%MrJNah098K>e(-qDAw5$7Re?dR(|9L-!D*`53kJ_O(WOhhE zoC@!P`EHzSChPPWZKChr7m)AYWAJBsAL~SI&y%f+8t{=)8~h`pzoRRE4wp|QNqLZn zJXF>ggyLbM<|SXnFH?oB(#n02r5|~4eU(+%suF%L2a3IK(wXHu{mYJX#60RV*4RHe zd*4jwo9Ph-f-n>>AJQ2bk>Dd*Eswtb%3K)~%JsnC`Oj#8N*KLqI9N5(kjUdvxfw9Z z@|fs$0<;L=|6(6_-o*TW=3AL8l$rRyh&2F<@D~}3DeLkEF=?3EBER0W53DX;{aLFT zpJ>XA8O7JEX|uSgRf0M%S0z|Q*G(1tsbcJ)9;3j{_%TTAyxiR33Zb2o|HZo7+|%9W zmvy)K7wc|oPj_2i*4@_sp}UIFUTo3*p#34C!#J~9ShdA!@>>Fb$MHnOWK*$pvQw~d zwliQc_KJ!{?`iT_1af`cMvP!6BQhKy&n1s11xlW1$nCS7GKhx zvy3=X5M+=mLe3S4D_q=ac4Ynf*d1=xTI%CJ3W1d};%`e-kt z02WqlmaZ4C1=%MJ97a(8^eIKZR|-X`hg~{2 zVi>7gKkQx~+QI8DZ7~W`l76~EbeFHeAKF3>+l4>0g&6ujcKgEyMzZ)s&cud^5J+1> z>W3eFjaj6BM}479rFvR?>_H(8^@Uw5?CQs0I3oUFAciALw)N=HxS(Sv?71*Dvi}zM ze$~?4^fHNR)v|Z&IVp3rF*XNlDhLa$(RHzrqBDx`7(r*Zebaxap>x9o<1loiXcW3| zgt)P4T{RxY_!VQ+y?(20YA^X`kS3#n7sK@9>Fq#&ey_aVm6lkZ%7y2qE~Yauc=)mbey@RxSUx8=L_przoH0yR|MZxfIk+&AN71tx=7JS ztA=^SxjSeU@I^}(c)mmyD1l)1!1vC)+hz;Y4V{>($5azrd7b8Du#tIf?cMo%O!pqZ z@kwT~P9}>iGZI-45)rakV#_A6RS~hagru5oNMorGDz*wr(BN20P)a01OHfLrRE3Dz zcSU-mL~Lnd?LB8Ew|8dl^!@|hd7krw=d+ye_cL=&&iNrPmz(XK;&Ej3@}`5YW@JB0 z={RX$!Gu%0!aq9kT(}*QI(_l2(D4y_R!_VBOI1lhdbyqh9n@#LOu;GV#09gC^acC4anfOe4o(SBvhLm%j9vdGXf7ovJ-K zv5g+Q`}FeROtVjB{W!Vud2nvUwQ-A^^j*LI!0y=Qp(Uxdf7k?; zD|PW=4*z}hVv z*L^xWdWd8Bm>Va3E1O@PTs!s1v035IidGf~!>)u68GL^CWaZ`DtNZFje0|`E@2TI8 z93ATP+V4WKch-A}{rY8m?s{!QO#g_b->$vCqQm+TR=ZZ)4-jH1@)M%RR1Qo%QsrYY zaA@SpW`|EF`Zztb>-9mWmcRIpd*t?h#BAHr{OKpo3cZ(9&umb#!Y;UX`081T)#WKe zH-Gs_yH5^Vn9sED<{Oq(<=1;{%Cq*K$*vwj{!PZW@hsiY!9MoOGw(cWxZa|FM%>K{ zgF@C8`M6hSj&)wL$Gs{pEHyCCC%Msz(`CiopC*=lIpohI`>D4s4~`DL)93nA^SLd? zN4tIYQ}gKXl`iqEU9HVuyD6t`X_VNs(p>eO*}XLPQHOe5i2SPbr+TICsS}(&svV|K z{Ng{qe@ei9bG{boc6>hZ#$E^vId@xjJzBx=CFxf14j1I^p71 zzsxFYv*zH=#D4c*yzMRAdU7`OU&FG}dlXK$`MxS`;rX{SHr)#DIP=oOkALf#6EMD2 zOjuCGwKXF<#iq_1*!A>`=b5*w_w1aWZ8z0Cy=++R$Ci;6wGj_ag+6`fT-l^cW#6bO z$|IWYA7$N7)7h;$BiHup1xc5;%}ACDySFA@n)Z!f{MtR?xeK=@-*`4BcSGdsgkcRr z52syx9I~_~>U_=f=Q}@A96xhxYnP7gitayMUh-OXpnsWgv?#$b=Eb8wRKDMOok=U+ zePxXJYiUGcX6D_l3xDYP%I5W=+3T-Wr9K(f`r*EWb~X+#*5&SX+7~dSO~$5?u_fc% zu3Epa%d%@5H=QlZET4SWKJMPIjZa?Ot+zC#{-FtdXGgvB?ey3fzn4D2OXU5nIuA;o zKl?~h;QIZR6WiRkx3Dc22DBhu<$*jETb_dK( zoEo?9>bD0AJ#Wm6>3yQjhzVc0pE@)7cx=(tjG5)mOS5LL-E7;SzMo+_WZ3ih3|K$9^f9=<)rWX!NmnFj&Hxv zch=1J&pn)EKR^53fKgj#MLl@db5^Ip+4E{l(e=f@s=1SxQxp1qhb}31 zj;^@2wuj~N@0xuc_VS#?sFEwU0=(lqD%>7)u6Yq{rTYGiYVzs$j~Zt^_Bv#9z0%^h zHRsv|CH-_a=;!^--%IgmQPMTC=60V2XWna=SF-x@?vk?~F1r@^S9;2&yjvODPm~Ni zdoHkF8;^mxKMj99r(4`^_io>uPMrT|$e=)*ruPOfO#C3UYsCuD3ttQjo-{LMT468WdB2vA`euDf z=b)p?HThQQ7UkQM`s}b>pXy?-sF+$f?2lm2!RmEePxtM!G{&d8t;)#m5zf} z{AMT@N-9mdxj&3MpLc7AdG zlUEs?)obi4Kd2b8tr>Z;J-nD;lp%k8R%V`|=jmSe{7WH#jNDYi0x)+n%RdMXXbww zmNhXtOZ~vNYsUESWr=Mw@9t|+w6ejbdp{^fjv3r@cTI6U_2AqIQ?5ouE~~W}A8s4e zepBF~kzR|QzdkuHt>kWp%MZNbmt_hwCY7Z(d~$u>6#s>hyY`*`P6A- zei*74ofgty^tSYc>b1v?JjlD^Rg^U#?cQ63mJ!ESjS9YZu+^>Ke|Ya&-v(Ki<6iub zzC$sf@&4lzl5WIqu~2$#y}w8?bHM!@?^Hk87n;`I;zp(W^Y|S%E_J)J`TL`O!|wlb zExl6@Vd3$bo3j(rE$m0_@rlh#j}KeY_)Nz90l8C$N4|GEZ`9D3OCN5DxFb)0_vTmE z^FGT#ozqaoGPVKNkYtJv7c%gLLzaHIQVxHf3Y~+fT zGp;#3jr;Y>#~EHX&bByT-gNQqwG&EiytT11_w>z}#XDR0k5;zvJGn2aJmBZyV_&X# z9J0aN=fR-*_eUgbPgi&c9yl7E7qw+r3&(7$X{}EFIAivZ6Nd^Wb`3k+;>eX@8?&qD z{ahZja%=5`UWMm>@$cMge`lXwk-dKZL3MxMlQ5UwmPz9`rRHZH9q73r!@70J{?vq^ zCD-mGZ*Ow=?K`u_TfB4;|gZ&ET4_LJE-o%{bRZg#N zy0`A=peX*hjo+=Z-zVIhW3gdg(ib5w>%DF6pVVoI{mHC&hwC#GCyp1j{5|jae&1^G z51*S%P53V3R+s3;bMt2e|K71OwlL%Hj_w&_2>GN`%7Bd&Mj&{mCymG;#xiO39 z#M@NdTa{9^z~ZCJmnwRG_`|aXUxxIY=N7!SQ-yMB!hzAdm)8uv@yCXoAAkN(?l<(y zpBH_8XY97(QD0~Diz$i;EqZp=?Y-9CPpn7vU3_U#qwK`DqvZ3vUuZ#SNN-tW3>qiQ8&{dUK6jJS~7SbCk90l>eYjd_&$*k6k>Q&u= zdWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0 zdWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0 zdWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0dWCw0diCb1S5=aFb>fL- zq|yMU(yCVyVD)p2Wj}*ZlUmCumU1an(_GO(xc=JG(I6f^*;Z+$jsLb@sb1=3)zBcU zqp==}?hE;czmqPh|)^P?Q9fT!?Ui&HB z1x-_hqmbdDvA0*rtn}F{t%&9HsGvMvruWlAI31{P78;jWH&SjEk*vA{Bnu=9Bnu=9 zBnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9 zBnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9 zBnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9Bnu=9B~17VJk%X zDeQ%5Q_P(Wohr%9Qb?+mkg8C)36}#E9R#~tOM8Q?S>0`lE#+dC@Kzt2fd--6J~m-y z+E96%O@u*6D`v?bi&ZBq#Z^>3wrQl?A{tqB2Sye~7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E z7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E z7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E7Dg6E z7Dg6E7Dg6E7Dg6E7Dg6E7Dm>aXJkE=jI7%uZ6gd}Dhb8X!d2Hkwe4#VYM*MGZ>tUc zk#5`FAQV2?R%xaU^_*fGW)RXzSWiR=E2P?0E%fkGHdW?|5?0-TgoT8KgoT8KgoT8K zgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8K zgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8K zgoT8KgoT8KgoT8KgoT8KgoT8KgoT8KgoT8Kg!Sf0SWhGgD@IU88p2ds2}^>jB33Df z8H6^kQZBQQOQEP7dSyF^d33R9XZ} zGOJD%+4V389j#P(o5`inrV_hw;d&E|(q1LA(r2wAs#Mn2|4HeoUoEVyQQg-@%vvf! zg+sL}NBwZ&m0H!?y5^asc5MtoI!3EnJnyJfRR`sEkntrPB3fG7<_&b9mVUVo)RK|{o~zpEmlx_l ztv|((!)p6z6vLCE;(od;FuxkH)JIT>)JI zT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JI zT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JI zT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)JIT>)LadC=7}3A&mzv0juROr?dcB(v(m z%zEKM!DeSCgLvtbdY{SVb@9%^>tKzIy-H@KZ(FUMRs`_|pE9Rjd;LhArS)7~S8{-JgmSNFY1JKAT3A|GT3A|GT3A|GT3A|G zT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|G zT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT3A|G zT3A|GT3A|GT3A|GT3A|GT3A|GT3A|GT5q1E^<1*F(l$6p8NyUrOG`4V&gDDTSz7vV zmCn+ti~rZs(ofM@T6HPC4Z7Vtd_D9X^m-%VzC8kTi^>5*h z>vQBU#Hdlj`UP{tc)GGs`XRxo+SOAoMMA1w!}TMDI_T<^81fR_Ix7!~ z&{f?5bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$; zbOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$; zbOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;bOm$;boJ&zSFa@K zsL7&zd`po4b*FNp_4(14j!pvlT(vZ-fua6;`jmm4bLKc?xp@&+oYSfI^3X% z$ZoC7DQs4x&hDqGEGUofJ6nA$Z=y_gQ250~6BhKf$Z*B=G&6URxyY=otz}Y5*_A1s z7b|44wV^VZx6DTN-=8!g$W`O#Y@$f`*j3{p|6rFwn7&KV$jw4#Wh&{Qn4}oAS0NLk zeKnpT#wic<*SE|}7HDwtHbX3gxFHrnQuB32%N8qzF>c}tdY!cpf}J%Dg#tH?bBKww zcxgB0bz2HEI6<$A7Q)K53NN9ni^id`!MOk7l)-H@9%e^`M71U;$oO1UMw{_7IM+_$ zN3qCxz0p3zqGcL!8%Lg43a1nrweZ?kqcN2wB#LR~hiZgJ8clOyzDlDMPBhTi2bpLX zpI_lU?xDEj1LC$@8?0iD@KB@aWU_x`eQ_BwnU#=GU*jKQ-1ec-<^l}bR^(U-f8|)U zkUpu6MmrQMg=bRl*Y4IrxUa%pSnI2>(0*LbrgDe6i@7hotOX};>#nU$H#FE`2ZN<- z@zYiY3lIFPRsU2zyneUknK?4qqgUp#CI;p8npq3>O~plKcxar0jMw+bXbLS1YF`Nl zJv41XHX98h8LvMDe}hHc5~g`-f`g3PKQ`KaQ-h*1;fANC zrSle}?TbZ%kC(WnTO(}+GfRbsZj+|cGNiPtpV|tkRtk;a6R1!Lm+dw7LYbGw-eliL zQo-GH{Q~dFwvN(hO!a@)TTFjzimgyoqjnRfs>M&(IPHni77Z`r5TVptyohs+wkQ@! z7qMBa5a^=`F%=e4eZ*5ou2KqdIm$Ldv5%&{$+RjdEjmY=)>+zyiBk#Em1=fNnBGtm z5MmsEYP5b|gOBKVtX+1Ios00Wp~lTQ&uAB7sc^zq<6(9AfSqjg*kobx#ClDnHJD0l z)`r{nL3%#Z0StrMj&gY^P}$WPIA{|2wNsg$2HvKBhhhnH=_j%J$H&fghLNi5PmxBS%3Q7CEW z7$SXrO(i7+h>QQJlVkR4PcI>Ey1C|`5~W8H`TB52A==fvfo`S7{c8X3N*4;z&Bc}O zGFquvq+O}`=E2!j-k!P#6H`gjO3gP9&2HH!Kq$Dcb~M>ZTBZ3H3Bq-Ig{N+j#;u+i zEzOlWISJr_gmKTAHtp? z;>z#L6wF#`S_z{=G)gVChRpDgjlT|gnae}XJN-JwWsb%GnFRILq21(bN1rqjf9L~O#^3BS<+PG z{c``#QVKyWHBKf|r3uOJ(u+HmeaOC2YSQER;Z=bWOh{NJ~@|9MNA zE8J@(UcLv6b|;a{+83mphps|Hb4A??l8H2f7o_(LmX`C>Rd7-$qJ)DAg{?46qp%bn zJau)IzJMkg3EEpxY_+QpUF{kmJ$oA`i7(FoXD1de=a>-goH5hxp_-ljf1m^QlX@+c=^7o)@6xr^`^6; z!o(~acPXn&kcl?&O&5h1%rKM5tSyXJ5Fwln({wd??tpe;*KjYXYxDnk2{myR?U>Dm f3Om|qg4}g+3rp$!w!c|_vjb@|S&t&M_^*EhAkQ!u delta 331034 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 &t;;F1Kj(3jM&*(O?LUy(nut<$Tg%+lte? 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 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 71330833b3..59f041e719 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.all.1129013170" + signature = "rusEFI 2021.07.05.all.2871364235" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.all.1129013170" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.all.2871364235" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:23 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index d5d2eb7d5c..d73a62bf86 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.f429-discovery.20415586" + signature = "rusEFI 2021.07.05.f429-discovery.3914944859" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.f429-discovery.20415586" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.f429-discovery.3914944859" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:18 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:27 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 3cd97c9768..fd4ad3992f 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.frankenso_na6.2063978891" + signature = "rusEFI 2021.07.05.frankenso_na6.2473264306" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.frankenso_na6.2063978891" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.frankenso_na6.2473264306" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:44 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 0cc65f6d90..38206d0699 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.hellen121nissan.1654215394" + signature = "rusEFI 2021.07.05.hellen121nissan.2331477979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen121nissan.1654215394" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.hellen121nissan.2331477979" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:33 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 1dadeaa825..73d301534f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.hellen121vag.2977936895" + signature = "rusEFI 2021.07.05.hellen121vag.1494311110" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen121vag.2977936895" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.hellen121vag.1494311110" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:23 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:31 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index a6644c7668..e3f25a9b42 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.hellen128.3031780182" + signature = "rusEFI 2021.07.05.hellen128.1557896815" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen128.3031780182" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.hellen128.1557896815" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:29 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 065a66c99d..287ff44722 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.hellen72.1928278861" + signature = "rusEFI 2021.07.05.hellen72.2592204404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen72.1928278861" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.hellen72.2592204404" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:35 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index e0ce776431..a46617bcf3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.hellenNA6.1054237370" + signature = "rusEFI 2021.07.05.hellenNA6.3602429827" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellenNA6.1054237370" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.hellenNA6.3602429827" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:37 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 209adb9e84..4f8682ee56 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.hellen_cypress.20415586" + signature = "rusEFI 2021.07.05.hellen_cypress.3914944859" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.hellen_cypress.20415586" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.hellen_cypress.3914944859" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Jul 04 13:36:46 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Jul 05 22:07:56 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index e9a4452db7..88ad853705 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.kin.4270999710" + signature = "rusEFI 2021.07.05.kin.385654183" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.kin.4270999710" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.kin.385654183" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 04 13:36:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Jul 05 22:07:54 UTC 2021 pageSize = 19972 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -882,7 +882,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 807d09d428..5d877c7f24 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.mre_f4.2790485222" + signature = "rusEFI 2021.07.05.mre_f4.1312668127" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.mre_f4.2790485222" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.mre_f4.1312668127" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:42 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index d7e7e88bf0..417b38dd74 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.mre_f7.2790485222" + signature = "rusEFI 2021.07.05.mre_f7.1312668127" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.mre_f7.2790485222" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.mre_f7.1312668127" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:39 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 16547b70f2..46582d3e85 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.prometheus_405.1373461892" + signature = "rusEFI 2021.07.05.prometheus_405.3115550909" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.prometheus_405.1373461892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.prometheus_405.3115550909" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:47 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index cd4a9fc13b..d29742ad32 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.prometheus_469.1373461892" + signature = "rusEFI 2021.07.05.prometheus_469.3115550909" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.prometheus_469.1373461892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.prometheus_469.3115550909" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:36 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:46 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index b6c2a0313a..537db79ced 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.proteus_f4.721281705" + signature = "rusEFI 2021.07.05.proteus_f4.3264427920" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.proteus_f4.721281705" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.proteus_f4.3264427920" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:52 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 779f8059a1..e0ffb2212b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.proteus_f7.721281705" + signature = "rusEFI 2021.07.05.proteus_f7.3264427920" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.proteus_f7.721281705" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.proteus_f7.3264427920" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 04 13:36:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:49 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 40d18b2124..e5b1707c3f 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.04.subaru_eg33_f7.3994505636" + signature = "rusEFI 2021.07.05.subaru_eg33_f7.108627101" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.04.subaru_eg33_f7.3994505636" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.05.subaru_eg33_f7.108627101" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; 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 Sun Jul 04 13:36:48 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 Mon Jul 05 22:07:57 UTC 2021 pageSize = 20000 page = 1 @@ -185,7 +185,7 @@ vbattDividerCoeff = scalar, F32, 464, "coef", 1, 0, 0.01, 99, 2 fanOnTemperature = scalar, F32, 468, "deg C", 1, 0, 0, 150, 0 fanOffTemperature = scalar, F32, 472, "deg C", 1, 0, 0, 150, 0 vehicleSpeedCoef = scalar, F32, 476, "coef", 1, 0, 0.01, 2000, 2 -canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +canNbcType = bits, U32, 480, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" canSleepPeriodMs = scalar, S32, 484, "ms", 1, 0, 0, 1000, 2 ambiguousOperationMode = bits, U32, 488, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank (requires VVT input)", "INVALID", "INVALID", "INVALID" displayMode = bits, U32, 492, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID" @@ -888,7 +888,7 @@ unusedBit_498_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_498_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_498_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_498_31 = bits, U32, 2116, [31:31], "false", "true" -can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "type 9", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +can2NbcType = bits, U32, 2120, [0:4], "None", "FIAT", "VAG", "MAZDA RX8", "BMW", "W202", "BMW E90", "Haltech", "VAG MQB", "Nissan VQ", "type 10", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [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" can2RxPin = bits, U08, 2125, [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" starterControlPinMode = bits, U08, 2126, [0:1], "default", "default inverted", "open collector", "open collector inverted" 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 be3ad3275a..e97a8cb260 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 Sun Jul 04 13:36:14 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Jul 05 22:07:23 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1250,7 +1250,6 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 1129013170; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1552,7 +1551,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.07.04.all.1129013170"; + public static final String TS_SIGNATURE = "rusEFI 2021.07.05.all.2871364235"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TT_TT_1_16 = 50; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index e8ef033f19..56afe0a15f 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +