From f93e59ea3dbfb461e75d07e8a0840f911c49fea1 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 28 Jul 2021 20:57:59 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 6 +++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 6 +++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 6 +++--- ...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 | 6 +++--- .../controllers/generated/signature_all.h | 4 ++-- .../controllers/generated/signature_atlas.h | 4 ++-- .../generated/signature_f429-discovery.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../generated/signature_hellen121nissan.h | 4 ++-- .../generated/signature_hellen121vag.h | 4 ++-- .../generated/signature_hellen128.h | 4 ++-- .../generated/signature_hellen72.h | 4 ++-- .../generated/signature_hellenNA6.h | 4 ++-- .../generated/signature_hellen_cypress.h | 4 ++-- .../controllers/generated/signature_kin.h | 4 ++-- .../controllers/generated/signature_mre_f4.h | 4 ++-- .../controllers/generated/signature_mre_f7.h | 4 ++-- .../generated/signature_prometheus_405.h | 4 ++-- .../generated/signature_prometheus_469.h | 4 ++-- .../generated/signature_proteus_f4.h | 4 ++-- .../generated/signature_proteus_f7.h | 4 ++-- .../generated/signature_subaru_eg33_f7.h | 4 ++-- firmware/tunerstudio/generated/cache.zip | Bin 1693372 -> 1693606 bytes firmware/tunerstudio/generated/rusefi.ini | 10 +++++----- .../tunerstudio/generated/rusefi_atlas.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_hellen128mercedes.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 | 6 +++--- java_console/rusefi.xml | 2 +- 51 files changed, 154 insertions(+), 154 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 e0c8cc84b9..ce20a24472 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 28 11:48:07 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 28 20:57:02 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4299,4 +4299,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 28 11:48:07 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 28 20:57:02 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 e2f317dbf3..3057e54181 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 @@ -182,7 +182,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", "CAN_BUS_NISSAN_VQ" +#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", "CAN_BUS_GENESIS_COUPE" #define CAN_RX_PREFIX "CAN_rx" #define can_vss_nbc_e_auto_enum "BMW_e46", "W202" #define canBaudRate_offset 2108 @@ -1321,7 +1321,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2046056982 +#define SIGNATURE_HASH 1269600698 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1677,7 +1677,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.28.hellen_cypress.2046056982" +#define TS_SIGNATURE "rusEFI 2021.07.28.hellen_cypress.1269600698" #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 a26f5dd201..6d85648915 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 28 11:48:05 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 28 20:57:00 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4293,4 +4293,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 28 11:48:05 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 28 20:57:00 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 a10b0d994e..91efbf4600 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -163,7 +163,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", "CAN_BUS_NISSAN_VQ" +#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", "CAN_BUS_GENESIS_COUPE" #define CAN_RX_PREFIX "CAN_rx" #define can_vss_nbc_e_auto_enum "BMW_e46", "W202" #define canBaudRate_offset 2108 @@ -1302,7 +1302,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2253493994 +#define SIGNATURE_HASH 3020512582 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1658,7 +1658,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.28.kin.2253493994" +#define TS_SIGNATURE "rusEFI 2021.07.28.kin.3020512582" #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 28f2f20102..c696973d33 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 28 11:48:09 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:57:04 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4299,4 +4299,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 28 11:48:09 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:57:04 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 17cb40353d..2689bab417 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 @@ -182,7 +182,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", "CAN_BUS_NISSAN_VQ" +#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", "CAN_BUS_GENESIS_COUPE" #define CAN_RX_PREFIX "CAN_rx" #define can_vss_nbc_e_auto_enum "BMW_e46", "W202" #define canBaudRate_offset 2108 @@ -1322,7 +1322,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 4247341168 +#define SIGNATURE_HASH 3480323036 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1678,7 +1678,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.07.28.subaru_eg33_f7.4247341168" +#define TS_SIGNATURE "rusEFI 2021.07.28.subaru_eg33_f7.3480323036" #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 5442be5b89..063051b2be 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 11:47:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:29 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4299,4 +4299,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 11:47:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:29 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index a7ed36c748..50a3224ce2 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 Wed Jul 28 11:47:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:29 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 cc168d3eab..53acb4a99a 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 Wed Jul 28 11:47:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:29 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 5e89187c4a..1ecfaa34bb 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 Wed Jul 28 11:47:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:29 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 f5ef68d613..d65d0ba3aa 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 Wed Jul 28 11:47:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:29 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 7c9411caf1..339f501863 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -180,7 +180,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", "CAN_BUS_NISSAN_VQ" +#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", "CAN_BUS_GENESIS_COUPE" #define CAN_RX_PREFIX "CAN_rx" #define can_vss_nbc_e_auto_enum "BMW_e46", "W202" #define canBaudRate_offset 2108 @@ -1318,7 +1318,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 998801862 +#define SIGNATURE_HASH 164645482 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1674,7 +1674,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.07.28.all.998801862" +#define TS_SIGNATURE "rusEFI 2021.07.28.all.164645482" #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 5f22b0b471..5b9c84e315 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 998801862 -#define TS_SIGNATURE "rusEFI 2021.07.28.all.998801862" +#define SIGNATURE_HASH 164645482 +#define TS_SIGNATURE "rusEFI 2021.07.28.all.164645482" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 2783f075eb..c7c107c71b 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD atlas #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2046056982 -#define TS_SIGNATURE "rusEFI 2021.07.28.atlas.2046056982" +#define SIGNATURE_HASH 1269600698 +#define TS_SIGNATURE "rusEFI 2021.07.28.atlas.1269600698" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index e97b5ccb03..089f834c54 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD f429-discovery #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2046056982 -#define TS_SIGNATURE "rusEFI 2021.07.28.f429-discovery.2046056982" +#define SIGNATURE_HASH 1269600698 +#define TS_SIGNATURE "rusEFI 2021.07.28.f429-discovery.1269600698" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 273952c96d..a5a84547a6 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 63311871 -#define TS_SIGNATURE "rusEFI 2021.07.28.frankenso_na6.63311871" +#define SIGNATURE_HASH 832488531 +#define TS_SIGNATURE "rusEFI 2021.07.28.frankenso_na6.832488531" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index b3257a15ef..a471eb9c9b 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 1371212136 -#define TS_SIGNATURE "rusEFI 2021.07.28.hellen121nissan.1371212136" +#define SIGNATURE_HASH 1675870916 +#define TS_SIGNATURE "rusEFI 2021.07.28.hellen121nissan.1675870916" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 0907ea57a3..e41d6fa35d 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 3608549047 -#define TS_SIGNATURE "rusEFI 2021.07.28.hellen121vag.3608549047" +#define SIGNATURE_HASH 3847150875 +#define TS_SIGNATURE "rusEFI 2021.07.28.hellen121vag.3847150875" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index de4f1a6253..a0ac53276b 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 1592702937 -#define TS_SIGNATURE "rusEFI 2021.07.28.hellen128.1592702937" +#define SIGNATURE_HASH 1823898741 +#define TS_SIGNATURE "rusEFI 2021.07.28.hellen128.1823898741" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index ca9ddb74d0..ff27ad162b 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 1750612472 -#define TS_SIGNATURE "rusEFI 2021.07.28.hellen72.1750612472" +#define SIGNATURE_HASH 1510011476 +#define TS_SIGNATURE "rusEFI 2021.07.28.hellen72.1510011476" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index e27c298722..c644834489 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2572283121 -#define TS_SIGNATURE "rusEFI 2021.07.28.hellenNA6.2572283121" +#define SIGNATURE_HASH 2869503837 +#define TS_SIGNATURE "rusEFI 2021.07.28.hellenNA6.2869503837" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 44a040bb49..9bf79fae57 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2046056982 -#define TS_SIGNATURE "rusEFI 2021.07.28.hellen_cypress.2046056982" +#define SIGNATURE_HASH 1269600698 +#define TS_SIGNATURE "rusEFI 2021.07.28.hellen_cypress.1269600698" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 51ce48b630..3565cc796f 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2253493994 -#define TS_SIGNATURE "rusEFI 2021.07.28.kin.2253493994" +#define SIGNATURE_HASH 3020512582 +#define TS_SIGNATURE "rusEFI 2021.07.28.kin.3020512582" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 36650ef2c7..bbb87dd7c6 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2409106348 -#define TS_SIGNATURE "rusEFI 2021.07.28.mre_f4.2409106348" +#define SIGNATURE_HASH 3183525888 +#define TS_SIGNATURE "rusEFI 2021.07.28.mre_f4.3183525888" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index d24104be0c..76757a8a67 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 2409106348 -#define TS_SIGNATURE "rusEFI 2021.07.28.mre_f7.2409106348" +#define SIGNATURE_HASH 3183525888 +#define TS_SIGNATURE "rusEFI 2021.07.28.mre_f7.3183525888" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e5d5bd6c2f..0ef603eb37 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 689865712 -#define TS_SIGNATURE "rusEFI 2021.07.28.prometheus_405.689865712" +#define SIGNATURE_HASH 457590876 +#define TS_SIGNATURE "rusEFI 2021.07.28.prometheus_405.457590876" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 25adc9fd2d..b4804eccdb 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 689865712 -#define TS_SIGNATURE "rusEFI 2021.07.28.prometheus_469.689865712" +#define SIGNATURE_HASH 457590876 +#define TS_SIGNATURE "rusEFI 2021.07.28.prometheus_469.457590876" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8ee7bf0741..46410ee5f8 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 4274440922 -#define TS_SIGNATURE "rusEFI 2021.07.28.proteus_f4.4274440922" +#define SIGNATURE_HASH 3432907126 +#define TS_SIGNATURE "rusEFI 2021.07.28.proteus_f4.3432907126" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 692cb20b1c..3f516df15a 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 4274440922 -#define TS_SIGNATURE "rusEFI 2021.07.28.proteus_f7.4274440922" +#define SIGNATURE_HASH 3432907126 +#define TS_SIGNATURE "rusEFI 2021.07.28.proteus_f7.3432907126" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 3069332def..22b3678f8e 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.07.28 -#define SIGNATURE_HASH 4247341168 -#define TS_SIGNATURE "rusEFI 2021.07.28.subaru_eg33_f7.4247341168" +#define SIGNATURE_HASH 3480323036 +#define TS_SIGNATURE "rusEFI 2021.07.28.subaru_eg33_f7.3480323036" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 07be3adaf364f38ed90f5901866cccdbd5785b2d..24d61418549978db4cfcd639275336c4daefc283 100644 GIT binary patch delta 563904 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�);k4b zgs2Yh#=Bwxswh%Q=mPj@nusUVTSUtygZuItUGdrp0}o@=uSRTJx^r$5!(VxNObHFa z0^@^?NvQol#%mPg6OiJdOBHMMVL+1aI@hYk#_lL-b9rE;j`>x1D5{jQKBt`mA zvVd$`Om4ELSt>=J;UA%7`3BCQ&>6;gFiw$(zHCDfB@HSbH{+*mf|2mLNd)Ew;ENAn ziZFz#t?62_{If5J8yJxXn?5Ysw0y`9OC6cu6Q(9!^1W9VrXoYLAilH zb0x0Z%Np!19tB804nvJWRbF?jz<0C`w2>0`e;%uQet}(@c<^Vm+Og5EOCR&DDRZw% zq)sbHRM$TmE}&b+Ep|roqZZ5XYsiuDu%A42zC_pF$@nb1&4h*G9{CSL(P29rj6nAJ z`IBjGPjO`kc^9bQKZWg%Awuz&&t^hw{tdJBmMAU)LP+~@IkBEb1S44_e4zBqb;jnoX z#OtiC1fs9~50nK6{lQAqlqdzEd_7^f_ke4!naE+Z zDMLeWm>#NJK5m7Mg+__A(I8!cAY#El^`ZTrLB==f z^%8p75q*;~h4f@KVRai`rSn+v?zhr3?&k1SYH2Gz3l?-x8J;3Ri%v#a zQ3n}kCg-S~@-i^#?gB&8vH&a(>O;;iNG|~^Y=XPeN-|Czj0)*GU=+QZo&@)qd$ZA#+e+x|^BVxOo*PiOGECgKx) z+enQ@j~{mbsezNQyoqfqVJoW{ds7%nh-`}I#^|;CKkVIQP?hi6KYY5oOG3I+3F!_2 z3F(#&>5y80f}{uni$+31KoAfVkdy`iK@e%ARip(`__OzK&)h!G>-)_;`*?B8nz_Em zdCmD|&0KY!pSz=9WIP6n>u?Ma0xK*Ps52ObCDY0VB{nPu+zStR9mZ*DDbaloTuI6L zREe2V43t*4A1Gw?L{z*SsldSD$l-MV3GWLdJZ+neoE6q}aggjuJQq46EY&#PTSA<{=?^yTEhd+rriLar&XCjHULv z4xC5C`Me+U8>*;tic_zP@IJlg)x@?VsEPi<{323q6z3;v3%LMVb`Zmyg;>CeJ++#B znP89J%yL5faQ?+D4Se2{hKdHnVCjeF^f^Y__~sXeCZB^uj5Q@2!uC~-$YXHy2yG(E zVjHRW#9xczcNODk>py%g$TDtq{1pQ$FMdm2KzhN8*n7uf1d*Iix_iv4L|4^xGb|9V zxwtLw?)#~^-xWOtH;+*VL>UytclBvG?R9Psmh3UsbCvO|edV6bmbPNpM`SC+#ZS05 z3Jye<%J@kkzi0H=kd&-EoZU58(B(dGprS@Ae$TI9M`K+5G>((=#v8>G(#UzTfMrVW z7QY3%@OP%LdAu%|*rG54?!$r&3eOuG}8qM0hjgerN z-IyG0*+tVkIqzT1UVJ}guJ8H9T0CFkqdrTG=y-+`Zm{)vze(;xOUa$Cx_g$geW=njDItIUa0iF%xnb>IF7N(z zGskRn?67NAVrtQ^ODKxB0D+jHSmRQ?^TuT4Z7uOn>zjp9b+G|X*?v1+&RgUmh_z)N z^JUUXHxCSM?6++qncQ{;dM{&D#a9niJ*kFbkFRTlVyNS1NJsZSv5`^!+Qaz>quDpU z#^Kb8L1QO1nR;vbLZNA$6I5Z3G zgyv4|r(ZT#HD&3lpWx>d?zg_ZlG?zO6*#^xBh75C8nkh>^cm&U;rins`BtYd?*)Ua z#iS_OOKyyyuGp6X|W2M+B* zwgW*9nZmoO5`<(;`c1<6!#R24tE7kcs+{j%UJn=9R=$yF>!FVB*JNtPEBma`P4h>g zvPbkvltsAgDK2+NUKpv%qwZ7zDz3ZggYPEQH8iL@G3MXaeqem1{#q3gEE+n{lUM83 zTwdFnScIvdC8WI)p@abssgK+~9lj(=5 zKW1Zm8vS3~%$uD;*_tm!)Zs5`UDWMf5##KZ_Gux_Ps{w=yOYd;Rv}NG^=!*-w5m#v zgG8V!Opb?|lHFT{$~R6}31QMSoS2BYxQR8$&F>hb%&wWUn|`e@<-Ta)Q}1_{WWSqw zJn^)nN4~wgRoLD3`uh`nL_CYSwP=*#H+$Vey|LlobmuEOmZl$ExDfa+cll4+mhaj= zuqXZUyrG;Q&Do=sde4n*%6-m-tc5Dxy2(B&hearg=03{#H?HhO*Jhd4o5Zs+Cpo0y zYw=R5`xhLXR7)XK=|4YiWcqB$#CS!G#%Z}MoDs{<{#n)fylth=$O zTHNt|-{}XR^trv}Uc+ncc**KU6*RlH8MP|LpR)f-3!wxm3d*{p1yVlv6>q8n)V~Z-v}m+hJhsRGmENi zaeRe0K1%iT;WItaQ9p%ZQT)!^zbA8Y%9NcJhxq$S`ms0f4h&qBd=|uL=^t5MOHz9I z>L7!FSI~e@G<^d_Hm8t#NvHD>xi_Pk@x$bf*rFz-ui^;WXRgw{U7a^@yWd|e!Im7f z$J%(9ZYbmE>7pG&p7IL8fgXP={0p&`cn_7ouUQ=CP_<|*4p&MQ!?(907vg8ZyS(}G zBDgnSoS&^?a82>x>__R21jD>K@>Ii~hhcRA1=6HR9kY2Ub;FZGFOP z{ZSHJtS>XiKgd1%40DabAJ)CvmvX2Kͤew7mI=!Fyxxm*byqw*wMa6j2Z1J6GC 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 K*f34$|NS3lKkz#M delta 563947 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

6)v3lwSlM=lo{GVXr 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 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 8697b9da26..7bdf5e295d 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.28.all.998801862" + signature = "rusEFI 2021.07.28.all.164645482" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.all.998801862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.all.164645482" ; 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 Wed Jul 28 11:47:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56: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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 7732f2bdf0..fdfee83eff 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.28.atlas.2046056982" + signature = "rusEFI 2021.07.28.atlas.1269600698" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.atlas.2046056982" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.atlas.1269600698" ; 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 Wed Jul 28 11:48:03 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:58 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 8c2428afa6..8395368270 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.28.f429-discovery.2046056982" + signature = "rusEFI 2021.07.28.f429-discovery.1269600698" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.f429-discovery.2046056982" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.f429-discovery.1269600698" ; 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 Wed Jul 28 11:47:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:32 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 7c4ad39cd3..d227e2c651 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.28.frankenso_na6.63311871" + signature = "rusEFI 2021.07.28.frankenso_na6.832488531" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.frankenso_na6.63311871" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.frankenso_na6.832488531" ; 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 Wed Jul 28 11:47:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:48 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 db3811dbf7..9a2d0625b0 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.28.hellen121nissan.1371212136" + signature = "rusEFI 2021.07.28.hellen121nissan.1675870916" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.hellen121nissan.1371212136" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.hellen121nissan.1675870916" ; 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 Wed Jul 28 11:47:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:38 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 dd0b801c60..34af5a81a9 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.28.hellen121vag.3608549047" + signature = "rusEFI 2021.07.28.hellen121vag.3847150875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.hellen121vag.3608549047" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.hellen121vag.3847150875" ; 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 Wed Jul 28 11:47:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56: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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 61228908d0..390333c4f4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.07.28.hellen128.1592702937" + signature = "rusEFI 2021.07.28.hellen128.1823898741" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.hellen128.1592702937" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.hellen128.1823898741" ; 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 Wed Jul 28 11:47:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:34 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 0771a9c2f5..6f65d1de67 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.28.hellen72.1750612472" + signature = "rusEFI 2021.07.28.hellen72.1510011476" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.hellen72.1750612472" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.hellen72.1510011476" ; 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 Wed Jul 28 11:47:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:40 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 e8d26be27b..42702d015e 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.28.hellenNA6.2572283121" + signature = "rusEFI 2021.07.28.hellenNA6.2869503837" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.hellenNA6.2572283121" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.hellenNA6.2869503837" ; 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 Wed Jul 28 11:47:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56: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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 d517899972..63b2ae0fdb 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.28.hellen_cypress.2046056982" + signature = "rusEFI 2021.07.28.hellen_cypress.1269600698" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.hellen_cypress.2046056982" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.hellen_cypress.1269600698" ; 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 Wed Jul 28 11:48:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jul 28 20:57:02 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 657b08067b..1900860872 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.28.kin.2253493994" + signature = "rusEFI 2021.07.28.kin.3020512582" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.kin.2253493994" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.kin.3020512582" ; 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 Wed Jul 28 11:48:05 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 28 20:57:00 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -893,7 +893,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 789dd1596e..54df4a8fb9 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.28.mre_f4.2409106348" + signature = "rusEFI 2021.07.28.mre_f4.3183525888" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.mre_f4.2409106348" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.mre_f4.3183525888" ; 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 Wed Jul 28 11:47:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56: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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 d1341a3af1..41c7d60d56 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.28.mre_f7.2409106348" + signature = "rusEFI 2021.07.28.mre_f7.3183525888" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.mre_f7.2409106348" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.mre_f7.3183525888" ; 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 Wed Jul 28 11:47:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56: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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 eb0961bfbb..dd08741c30 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.28.prometheus_405.689865712" + signature = "rusEFI 2021.07.28.prometheus_405.457590876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.prometheus_405.689865712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.prometheus_405.457590876" ; 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 Wed Jul 28 11:47:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56: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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 070b8f5f15..14b33f81e8 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.28.prometheus_469.689865712" + signature = "rusEFI 2021.07.28.prometheus_469.457590876" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.prometheus_469.689865712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.prometheus_469.457590876" ; 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 Wed Jul 28 11:47:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:50 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 d54a414544..74eee50d59 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.28.proteus_f4.4274440922" + signature = "rusEFI 2021.07.28.proteus_f4.3432907126" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.proteus_f4.4274440922" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.proteus_f4.3432907126" ; 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 Wed Jul 28 11:48:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56: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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 c0dcaed241..a16fb61186 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.28.proteus_f7.4274440922" + signature = "rusEFI 2021.07.28.proteus_f7.3432907126" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.proteus_f7.4274440922" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.proteus_f7.3432907126" ; 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 Wed Jul 28 11:47:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:54 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 420d647fe7..92e1d7d2ce 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.28.subaru_eg33_f7.4247341168" + signature = "rusEFI 2021.07.28.subaru_eg33_f7.3480323036" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.07.28.subaru_eg33_f7.4247341168" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.07.28.subaru_eg33_f7.3480323036" ; 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 Wed Jul 28 11:48:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:57:04 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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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" @@ -902,7 +902,7 @@ unusedBit_500_28 = bits, U32, 2116, [28:28], "false", "true" unusedBit_500_29 = bits, U32, 2116, [29:29], "false", "true" unusedBit_500_30 = bits, U32, 2116, [30:30], "false", "true" unusedBit_500_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", "Nissan VQ35", "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 VQ35", "Genesis Coupe", "type 11", "type 12", "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 dc6bba880a..574d3a8ec8 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 11:47:35 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 28 20:56:29 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1273,7 +1273,7 @@ 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 = 998801862; + public static final int SIGNATURE_HASH = 164645482; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1580,7 +1580,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.07.28.all.998801862"; + public static final String TS_SIGNATURE = "rusEFI 2021.07.28.all.164645482"; 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 f8229e37a2..6b30ae79a1 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +